From b9595c7e4dcb9a84c3e222f88fcdaeba55941947 Mon Sep 17 00:00:00 2001 From: dixxe Date: Sun, 24 Nov 2024 11:37:23 +0300 Subject: [PATCH] update --- flake.lock | 84 +++++++++++++++---------------- home-manager/modules/git.nix | 7 +-- home-manager/modules/helix.nix | 2 + home-manager/modules/stylix.nix | 2 +- home-manager/modules/vscodium.nix | 13 +++++ home-manager/your-modules.nix | 3 +- home-manager/your-packages.nix | 8 +-- nixos/modules/zerotierone.nix | 8 +++ nixos/user_modules.nix | 1 + 9 files changed, 76 insertions(+), 52 deletions(-) create mode 100644 home-manager/modules/vscodium.nix create mode 100644 nixos/modules/zerotierone.nix diff --git a/flake.lock b/flake.lock index 40ff62e..1e77580 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -287,11 +287,11 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { @@ -308,11 +308,11 @@ ] }, "locked": { - "lastModified": 1731535640, - "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", + "lastModified": 1732025103, + "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b055009afd0107b69c286fca34d2ad98940d57", + "rev": "a46e702093a5c46e192243edbd977d5749e7f294", "type": "github" }, "original": { @@ -329,11 +329,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1731454423, - "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", + "lastModified": 1732016537, + "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", + "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", "type": "github" }, "original": { @@ -393,11 +393,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731531548, - "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "24f0d4acd634792badd6470134c387a3b039dace", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -409,11 +409,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -454,11 +454,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731675303, - "narHash": "sha256-Pd0ZZICCwwDIE+ruHTDg8Oaizna5bJrdw5BSTht+Pdc=", + "lastModified": 1732143099, + "narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=", "owner": "nix-community", "repo": "nixvim", - "rev": "46e574d4ea1642dd87a6bfb162053c52b2e4878b", + "rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1731347683, - "narHash": "sha256-BcSWCEUBShuB32LPif+EG0XGXyUi2jyjCSpGE1rbOws=", + "lastModified": 1731936508, + "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", "owner": "NuschtOS", "repo": "search", - "rev": "135d202e032be70c93b6d7d53592ef4799d6efde", + "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", "type": "github" }, "original": { @@ -516,11 +516,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1731657386, - "narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=", + "lastModified": 1732261424, + "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=", "owner": "danth", "repo": "stylix", - "rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f", + "rev": "b667a340730dd3d0596083aa7c949eef01367c62", "type": "github" }, "original": { @@ -617,11 +617,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1732111664, + "narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0", "type": "github" }, "original": { diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index d46220c..254044f 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -3,8 +3,8 @@ { programs.git = { enable = true; - userEmail = "dixxe.mail@proton.me"; # Hello there :D. - userName = "ficache"; + userName = "dixxe"; + userEmail = "max.pan@tuta.io"; extraConfig = { credential.helper = [ "cache --timeout 21600" @@ -16,8 +16,5 @@ home.packages = with pkgs; [ # Pretty wonky, but idk git-credential-oauth # how to make it better - gnupg - pinentry-qt - meld ]; } diff --git a/home-manager/modules/helix.nix b/home-manager/modules/helix.nix index 86eb821..afbe81f 100644 --- a/home-manager/modules/helix.nix +++ b/home-manager/modules/helix.nix @@ -3,9 +3,11 @@ programs.helix = { enable = true; defaultEditor = true; + extraPackages = with pkgs; [ marksman nil ]; + # Stylix have troubles with theme for helix right now. }; } diff --git a/home-manager/modules/stylix.nix b/home-manager/modules/stylix.nix index b4fcc10..488bbcc 100644 --- a/home-manager/modules/stylix.nix +++ b/home-manager/modules/stylix.nix @@ -5,7 +5,7 @@ stylix = { enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-soft.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-frappe.yaml"; image = ../../wallpaper3.png; diff --git a/home-manager/modules/vscodium.nix b/home-manager/modules/vscodium.nix new file mode 100644 index 0000000..8bc9fbf --- /dev/null +++ b/home-manager/modules/vscodium.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + jnoortheen.nix-ide + ms-dotnettools.vscode-dotnet-runtime + ms-dotnettools.csharp + golang.go + ]; + }; +} diff --git a/home-manager/your-modules.nix b/home-manager/your-modules.nix index 63afd35..08b3661 100644 --- a/home-manager/your-modules.nix +++ b/home-manager/your-modules.nix @@ -4,6 +4,7 @@ ./modules/git.nix ./modules/stylix.nix ./modules/syncthing.nix - ./modules/helix.nix + #./modules/helix.nix + ./modules/vscodium.nix ]; } diff --git a/home-manager/your-packages.nix b/home-manager/your-packages.nix index 3450772..7b9cc53 100644 --- a/home-manager/your-packages.nix +++ b/home-manager/your-packages.nix @@ -2,9 +2,8 @@ { home.packages = with pkgs; [ - obsidian + obsidian alacritty - grimblast vlc # Social stuff @@ -17,11 +16,14 @@ # Minecraft stuff prismlauncher - #Random stuff + #Development stuff krita + dotnetCorePackages.sdk_9_0 + godot_4-mono ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "obsidian" ]; + } diff --git a/nixos/modules/zerotierone.nix b/nixos/modules/zerotierone.nix new file mode 100644 index 0000000..b86586a --- /dev/null +++ b/nixos/modules/zerotierone.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + services.zerotierone = { + enable = true; + joinNetworks = [ "41d49af6c287fe2b" ]; + }; +} + \ No newline at end of file diff --git a/nixos/user_modules.nix b/nixos/user_modules.nix index ca66516..c7d5e3a 100644 --- a/nixos/user_modules.nix +++ b/nixos/user_modules.nix @@ -4,6 +4,7 @@ ./modules/pipewire.nix ./modules/auto-cpufreq.nix ./modules/zapret.nix + ./modules/zerotierone.nix ./modules/hardware/nvidia.nix ./modules/hardware/battery-threshold.nix