diff --git a/README.md b/README.md index c23c5b8..d2f8953 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ Here is the high-level tree structure of the repository: │   │   │   ├── hyprland.nix │   │   │   ├── network-manager.nix │   │   │   ├── niri.nix +│   │   │   ├── noctalia-greeter.nix │   │   │   ├── noctalia.nix │   │   │   ├── nvidia.nix │   │   │   ├── openssh.nix @@ -53,7 +54,6 @@ Here is the high-level tree structure of the repository: │   │   │   ├── sysrq.nix │   │   │   ├── systemd-boot.nix │   │   │   ├── tts.nix -│   │   │   ├── tuigreet.nix │   │   │   ├── udisks2.nix │   │   │   ├── vietnamese-input-method.nix │   │   │   ├── zoxide.nix @@ -75,9 +75,6 @@ Here is the high-level tree structure of the repository: │   │   │   ├── hm-env.nix │   │   │   ├── hm-fish.nix │   │   │   └── hm-xdg.nix -│   │   ├── secrets -│   │   │   ├── cachix-auth-token.age -│   │   │   └── secrets.nix │   │   ├── configuration.nix │   │   ├── default.nix │   │   ├── hardware.nix diff --git a/flake.lock b/flake.lock index 2c3133a..c9eab26 100644 --- a/flake.lock +++ b/flake.lock @@ -20,35 +20,14 @@ "type": "github" } }, - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1770165109, - "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", - "owner": "ryantm", - "repo": "agenix", - "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1781468456, - "narHash": "sha256-0nJ5RUyUQ/rEz8Lai9I1kLKwpzhnL6KLePSnO4IZh64=", + "lastModified": 1782811891, + "narHash": "sha256-xLfMSeSKKHmYCESe9Ca24eSXUsEV5z1oC59Cqfb7s8U=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "68925a2fb4eb362d4dd6cf2c3e9d85e434a96298", + "rev": "dc2bfb6686ce41d04185d1a3a11b2b6fc24aeca6", "type": "github" }, "original": { @@ -60,11 +39,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1781605133, - "narHash": "sha256-lmxxhcZt3qSHPS3ETDeN2OIZqC4yIa3uVpMXuIR+8Rc=", + "lastModified": 1782814529, + "narHash": "sha256-YGYe7cy8vUFguQzdCt6FP1B/viF53cJdFZhNJ8Rpp5Y=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "3d40b72fc3c40581269f9e7a12433950f2fd6d95", + "rev": "f98908d8b5cacc4c24a6039ffd9f41f6a0de4ba2", "type": "github" }, "original": { @@ -73,28 +52,6 @@ "type": "github" } }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "fcitx5-lotus": { "inputs": { "nixpkgs": [ @@ -103,11 +60,11 @@ "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1780909414, - "narHash": "sha256-J92glvc5aKXPDUowyvVz0KBnwv91xwrvuBlcnr+YCzw=", + "lastModified": 1782320451, + "narHash": "sha256-pwuGAW8qlb18VeXkTeqW8JRgJLryf3A/Y7KVzJQvOqQ=", "owner": "LotusInputMethod", "repo": "fcitx5-lotus", - "rev": "125d58c55231d72165cd9347ace852fe9ad8b77f", + "rev": "f5540f8837f664f6705fa61d97208c9ee3e1ce9d", "type": "github" }, "original": { @@ -169,11 +126,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -187,11 +144,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -224,7 +181,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1694529238, @@ -260,38 +217,17 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1781642113, - "narHash": "sha256-mAR7KTS9rjreTcXCNqfCbN96mnhJO8lDQq1vl7GviBQ=", + "lastModified": 1783024095, + "narHash": "sha256-oE+TNK98Pl7nHW4VU1oBvUKD5JR45U+py/NJmLoTNHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "df4e0465717a2d34f05b8ccd967275aaf3ceaa01", + "rev": "a4d410db95a6416d1008049330bd86b85b5db45a", "type": "github" }, "original": { @@ -399,14 +335,14 @@ "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1781641735, - "narHash": "sha256-YO+XXSsk5Rc9gEN0tUcRUKT82ktTnH33TdQqOGfzgps=", + "lastModified": 1783018940, + "narHash": "sha256-fQ4+88WbgRkQYCMF37GYNuthHojlYhvfIAKJpSynVyk=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "16b69e2ee5d498b0a6c4e7347a2a8400bf25d50d", + "rev": "3a4f4055db5f96ce696b5704c996d5bffbcda58d", "type": "github" }, "original": { @@ -417,27 +353,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "lastModified": 1783003425, + "narHash": "sha256-CLVsEepcFedoiIwXVlAYam9bbTt3mmTJXgGrvoLDDFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "rev": "6147971a7160e60cf691651d97cc8411395f5d90", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -448,11 +384,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -463,27 +399,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1781612504, - "narHash": "sha256-pq85N+/bJcjWdNdpgedfVuqtooZpOgTjSiQC7TwZGV0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c190319055bb5c31acfd7bb8356ce9ab05cb2b36", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1782723713, + "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", "type": "github" }, "original": { @@ -493,7 +413,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1774386573, "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", @@ -516,11 +436,11 @@ ] }, "locked": { - "lastModified": 1781663688, - "narHash": "sha256-EFnfHLJLfLT+lCw7UbAYvadJ3BQ2AB1XCEnJMHuGe8s=", + "lastModified": 1783039622, + "narHash": "sha256-RHgZ1P0yWOvApgArWzKllRWC0ByNa5JfcywJddf3qVY=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9503d74f1ff2745c7760899e7b566ee749458924", + "rev": "6e7aa3b4daaf13f3cd7c622b248efaba5c1c1eb3", "type": "github" }, "original": { @@ -529,6 +449,26 @@ "type": "github" } }, + "noctalia-greeter": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1783017881, + "narHash": "sha256-DxNSea+/oLlCFolk5HH1ZEVGlaLkXesj6jDI7TNWPAU=", + "owner": "noctalia-dev", + "repo": "noctalia-greeter", + "rev": "a3265c8c16d3cf338cbb39c7ca718991578e4e26", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-greeter", + "type": "github" + } + }, "noobvim": { "inputs": { "nixpkgs": [ @@ -556,8 +496,8 @@ "flake-parts": "flake-parts_3", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_4", - "systems": "systems_3" + "nixpkgs": "nixpkgs_3", + "systems": "systems_2" }, "locked": { "lastModified": 1777062815, @@ -576,16 +516,16 @@ "root": { "inputs": { "HyprQuickFrame": "HyprQuickFrame", - "agenix": "agenix", "fcitx5-lotus": "fcitx5-lotus", "flake-parts": "flake-parts", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "import-tree": "import-tree", "jcm": "jcm", "keypop": "keypop", "nix-cachyos-kernel": "nix-cachyos-kernel", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "noctalia": "noctalia", + "noctalia-greeter": "noctalia-greeter", "noobvim": "noobvim", "wayvibes": "wayvibes", "zen-browser": "zen-browser" @@ -644,21 +584,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "wayvibes": { "inputs": { "nixpkgs": [ @@ -686,11 +611,11 @@ ] }, "locked": { - "lastModified": 1781415399, - "narHash": "sha256-t7l/1scSsVAlw1r/vjEIX+SquZa/z6ibcOLBuXdJH7E=", + "lastModified": 1782624757, + "narHash": "sha256-pqFaCAV+g8H+p0kE4vYn9ZgcEFvt644zGy7SyCdf9c8=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "83ab3c3da2ba1a76a20882dbd253711d2cb8dcba", + "rev": "907465791e7064d86d37964dd95e23280dfb68da", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0e21641..cf5452d 100644 --- a/flake.nix +++ b/flake.nix @@ -45,8 +45,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - agenix.url = "github:ryantm/agenix"; - noctalia = { url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; @@ -56,11 +54,12 @@ url = "github:Ronin-CK/HyprQuickFrame"; inputs.nixpkgs.follows = "nixpkgs"; }; + + noctalia-greeter = { + url = "github:noctalia-dev/noctalia-greeter"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = - inputs: - inputs.flake-parts.lib.mkFlake { inherit inputs; } ( - inputs.import-tree.filterNot (path: baseNameOf path == "secrets.nix") ./modules - ); + outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); } diff --git a/modules/common/features/cachyos-kernel.nix b/modules/common/features/cachyos-kernel.nix index 7510a3e..1f943c5 100644 --- a/modules/common/features/cachyos-kernel.nix +++ b/modules/common/features/cachyos-kernel.nix @@ -7,10 +7,14 @@ }: { nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.default ]; - boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-lts-lto-x86_64-v3; - nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ]; + boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v3; + nix.settings.substituters = [ "https://cache.xinux.uz" ]; nix.settings.trusted-public-keys = [ - "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" + "cache.xinux.uz:BXCrtqejFjWzWEB9YuGB7X2MV4ttBur1N8BkwQRdH+0=" ]; + # nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ]; + # nix.settings.trusted-public-keys = [ + # "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" + # ]; }; } diff --git a/modules/common/features/docker.nix b/modules/common/features/docker.nix index bf75a77..02e7de2 100644 --- a/modules/common/features/docker.nix +++ b/modules/common/features/docker.nix @@ -3,7 +3,6 @@ virtualisation = { docker = { enable = true; - storageDriver = "btrfs"; }; }; }; diff --git a/modules/common/features/home-manager/hm-wayvibes.nix b/modules/common/features/home-manager/hm-wayvibes.nix index e47a739..5ba1231 100644 --- a/modules/common/features/home-manager/hm-wayvibes.nix +++ b/modules/common/features/home-manager/hm-wayvibes.nix @@ -7,8 +7,8 @@ services.wayvibes = { enable = true; - soundpack = "/home/hiepnh/proj/wayvibes/soundpacks/cherrymx-red-abs"; - volume = 3; + soundpack = "/home/hiepnh/Projects/wayvibes/soundpacks/cherrymx-red-abs"; + volume = 2; }; }; } diff --git a/modules/common/features/noctalia-greeter.nix b/modules/common/features/noctalia-greeter.nix new file mode 100644 index 0000000..2466510 --- /dev/null +++ b/modules/common/features/noctalia-greeter.nix @@ -0,0 +1,13 @@ +{ + flake.nixosModules.noctaliaGreeter = { inputs, pkgs, ... }: { + imports = [ + inputs.noctalia-greeter.nixosModules.default + ]; + + programs.noctalia-greeter = { + enable = true; + package = inputs.noctalia-greeter.packages.${pkgs.stdenv.hostPlatform.system}.default; + greeter-args = ""; + }; + }; +} diff --git a/modules/common/features/tuigreet.nix b/modules/common/features/tuigreet.nix deleted file mode 100644 index e40b735..0000000 --- a/modules/common/features/tuigreet.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - flake.nixosModules.tuigreet = - { pkgs, ... }: - { - services.greetd = { - enable = true; - useTextGreeter = true; - settings = { - default_session = { - command = "${pkgs.tuigreet}/bin/tuigreet --time --asterisks --greeting 'Hey, YOU. Stay away from my computer!' --remember --cmd 'uwsm start hyprland.desktop'"; - user = "greeter"; - }; - }; - }; - - nixpkgs.overlays = [ - (_: prev: { - tuigreet = - let - newSrc = prev.fetchFromGitHub { - owner = "NotAShelf"; - repo = "tuigreet"; - tag = "0.10.2"; - hash = "sha256-jeelrp9r/V8540qKoCofD8wz/w/qBcubs72HkremhME="; - }; - in - prev.tuigreet.overrideAttrs { - src = newSrc; - cargoDeps = prev.rustPlatform.fetchCargoVendor { - src = newSrc; - hash = "sha256-B5Qxwv8jdpGJwXTEm5c12kvb6fri7H1AL2w640xQXVQ="; - }; - }; - }) - ]; - }; -} diff --git a/modules/hosts/nixos-pc/configuration.nix b/modules/hosts/nixos-pc/configuration.nix index 33560e8..ad60a1c 100644 --- a/modules/hosts/nixos-pc/configuration.nix +++ b/modules/hosts/nixos-pc/configuration.nix @@ -31,14 +31,6 @@ networking.hostName = "nixos-pc"; - age.secrets = { - cachixAuthToken = { - file = ./secrets/cachix-auth-token.age; - owner = "hiepnh"; - mode = "0400"; - }; - }; - environment.sessionVariables = { EDITOR = "nvim"; }; diff --git a/modules/hosts/nixos-pc/default.nix b/modules/hosts/nixos-pc/default.nix index 477da6a..657d10f 100644 --- a/modules/hosts/nixos-pc/default.nix +++ b/modules/hosts/nixos-pc/default.nix @@ -8,8 +8,6 @@ specialArgs = { inherit inputs; }; modules = [ - inputs.agenix.nixosModules.default - self.nixosModules.nixosPcConfiguration self.nixosModules.homeManager @@ -18,7 +16,7 @@ self.desktopBundle.nixosModules self.nixosModules.hyprland - self.nixosModules.tuigreet + self.nixosModules.noctaliaGreeter self.nixosModules.zsh self.nixosModules.fish self.nixosModules.zoxide diff --git a/modules/hosts/nixos-pc/features/suspend-hibernate.nix b/modules/hosts/nixos-pc/features/suspend-hibernate.nix index ef2b94d..a98a287 100644 --- a/modules/hosts/nixos-pc/features/suspend-hibernate.nix +++ b/modules/hosts/nixos-pc/features/suspend-hibernate.nix @@ -1,14 +1,25 @@ { flake.nixosModules.suspendHibernate = _: { + swapDevices = [ + { + device = "/var/lib/swapfile"; + size = 10 * 1024; + } + ]; + boot = { # UUID of / partition - resumeDevice = "/dev/disk/by-uuid/49d6e9ce-6eaf-423b-8b64-978d870a1451"; + resumeDevice = "/dev/disk/by-uuid/66699bf2-70c1-4ddc-8180-4553254dfe67"; + + kernel.sysctl = { + "vm.swappiness" = 20; + }; # resume_offset is only for swapfile, to get resume_offset value: - # If ext4: filefrag -v swap_file | awk '$1=="0:" {print substr($4, 1, length($4)-2)}' - # If btrfs: btrfs inspect-internal map-swapfile -r swap_file + # If ext4: filefrag -v /path/to/swap_file | awk '$1=="0:" {print substr($4, 1, length($4)-2)}' + # If btrfs: btrfs inspect-internal map-swapfile -r /path/to/swap_file kernelParams = [ - "resume_offset=1208020" + "resume_offset=49051648" "mem_sleep_default=s2idle" "nvidia.NVreg_PreserveVideoMemoryAllocations=1" "nvidia.NVreg_TemporaryFilePath=/var/tmp" diff --git a/modules/hosts/nixos-pc/hardware.nix b/modules/hosts/nixos-pc/hardware.nix index fbe61a3..b26f232 100644 --- a/modules/hosts/nixos-pc/hardware.nix +++ b/modules/hosts/nixos-pc/hardware.nix @@ -1,3 +1,6 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. { flake.nixosModules.nixosPcHardware = { @@ -6,75 +9,39 @@ modulesPath, ... }: + { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot = { - initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - ]; - initrd.kernelModules = [ ]; - kernelModules = [ "kvm-intel" ]; - extraModulePackages = [ ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/66699bf2-70c1-4ddc-8180-4553254dfe67"; + fsType = "ext4"; }; - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/49d6e9ce-6eaf-423b-8b64-978d870a1451"; - fsType = "btrfs"; - options = [ - "subvol=root" - "compress=zstd" - ]; - }; - "/home" = { - device = "/dev/disk/by-uuid/49d6e9ce-6eaf-423b-8b64-978d870a1451"; - fsType = "btrfs"; - options = [ - "subvol=home" - "compress=zstd" - ]; - }; - "/nix" = { - device = "/dev/disk/by-uuid/49d6e9ce-6eaf-423b-8b64-978d870a1451"; - fsType = "btrfs"; - options = [ - "subvol=nix" - "compress=zstd" - "noatime" - ]; - }; - "/swap" = { - device = "/dev/disk/by-uuid/49d6e9ce-6eaf-423b-8b64-978d870a1451"; - fsType = "btrfs"; - options = [ - "subvol=swap" - "noatime" - ]; - }; - "/boot" = { - device = "/dev/disk/by-uuid/F59D-7D65"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" - ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/B38A-F68F"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; }; - swapDevices = [ - { - device = "/swap/swapfile"; - size = 10240; - } - ]; + swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/modules/hosts/nixos-pc/home/hiepnh/default.nix b/modules/hosts/nixos-pc/home/hiepnh/default.nix index 4b572a3..24edad7 100644 --- a/modules/hosts/nixos-pc/home/hiepnh/default.nix +++ b/modules/hosts/nixos-pc/home/hiepnh/default.nix @@ -1,6 +1,6 @@ { self, ... }: { - flake.homeModules.hiepnhModule = _: { + flake.homeModules.hiepnhModule = { config, ... }: { imports = [ self.coreSystemBundle.homeModules self.devBundle.homeModules @@ -22,7 +22,8 @@ userName = "Nguyen Hong Hiep"; userEmail = "syaorancode@gmail.com"; defaultBranch = "main"; - signingKey = "88ADF3E7C761E5A7"; + signingFormat = "ssh"; + signingKey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub"; }; }; } diff --git a/modules/hosts/nixos-pc/packages.nix b/modules/hosts/nixos-pc/packages.nix index d88a5c6..eb91ac7 100644 --- a/modules/hosts/nixos-pc/packages.nix +++ b/modules/hosts/nixos-pc/packages.nix @@ -21,9 +21,7 @@ telegram-desktop obs-studio keepassxc - qogir-icon-theme brightnessctl - easyeffects gimp grim slurp @@ -36,9 +34,7 @@ tela-circle-icon-theme lutris blobdrop - zed-editor-fhs kdePackages.okular - jetbrains-toolbox postman winboat localsend @@ -78,7 +74,6 @@ self.packages.${pkgs.stdenv.hostPlatform.system}.wlctl inputs.keypop.packages.${pkgs.stdenv.hostPlatform.system}.default - inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.default inputs.noobvim.packages.${pkgs.stdenv.hostPlatform.system}.default inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default (inputs.HyprQuickFrame.packages.${pkgs.stdenv.hostPlatform.system}.default.overrideAttrs (old: { diff --git a/modules/hosts/nixos-pc/secrets/cachix-auth-token.age b/modules/hosts/nixos-pc/secrets/cachix-auth-token.age deleted file mode 100644 index 58b9e8d..0000000 Binary files a/modules/hosts/nixos-pc/secrets/cachix-auth-token.age and /dev/null differ diff --git a/modules/hosts/nixos-pc/secrets/secrets.nix b/modules/hosts/nixos-pc/secrets/secrets.nix deleted file mode 100644 index 8f00111..0000000 --- a/modules/hosts/nixos-pc/secrets/secrets.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - hiepnh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKgyh6uAN6XJarCz7XKLawjsgi6mAvIDBMmbZyahPSNC"; -in -{ - "cachix-auth-token.age".publicKeys = [ hiepnh ]; -}