flake: update dependencies

repo: move common home packages into home/default.nix
repo: refactor to remove home/profiles
2024-10-21 16:02:55 +02:00 · 2024-10-21 15:49:07 +02:00 · 2024-10-21 15:34:23 +02:00
11 changed files with 144 additions and 163 deletions
--- a/flake.lock
+++ b/flake.lock
@ -47,11 +47,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1729092978,
-        "narHash": "sha256-2SMJFFgKSvrQfkfzdcYjwFGvgeoCtDdbl/CGZNIU7hs=",
+        "lastModified": 1729510449,
+        "narHash": "sha256-/EwjBMYBZ3/2ROT+4M/6tLomgJEgZBpKosWhqtYZkDI=",
        "owner": "chaotic-cx",
        "repo": "nyx",
-        "rev": "9af42c96e8d666f1df2b087aba1a6349f1c22f4e",
+        "rev": "4e03e8d762623ca925c604800aa18f109cd3bd97",
        "type": "github"
      },
      "original": {
@ -361,11 +361,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728903686,
-        "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=",
+        "lastModified": 1729414726,
+        "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f",
+        "rev": "fe56302339bb28e3471632379d733547caec8103",
        "type": "github"
      },
      "original": {
@ -381,11 +381,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729027341,
-        "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
+        "lastModified": 1729459288,
+        "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
+        "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
        "type": "github"
      },
      "original": {
@ -403,11 +403,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1728974938,
-        "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=",
+        "lastModified": 1729177642,
+        "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "23170582b0658e6afd913149a58863af3a57b376",
+        "rev": "bb69165ff372ddbd3228a03513922acd783040e8",
        "type": "github"
      },
      "original": {
@ -534,11 +534,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1729090125,
-        "narHash": "sha256-jZQe55BWLEv6OwItbL7mMsm8A3/1rrLk4vTm3k7+jqg=",
+        "lastModified": 1729499378,
+        "narHash": "sha256-gslhStBw58+LAbcver/2/Q6zjPq9xNZQ/IcoIh7OBck=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "44d93e05a400cad197fd10f9d50e9475fc519326",
+        "rev": "2e46e95f0e5be7cea740163d87edf628e755cc3e",
        "type": "github"
      },
      "original": {
@ -567,11 +567,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1729086716,
-        "narHash": "sha256-xF1AtbQ+ipQyzyXV8mWGlndbeqACM3IIadyCHO0OtpU=",
+        "lastModified": 1729444736,
+        "narHash": "sha256-/Q1yf6f9nUBFVqI/t89xfTPmQipaug63LP8TeENg4CA=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "84655d3b2627687e14431adb49450cd6af1de40f",
+        "rev": "289ae3604d705cebc82cbcd23ee4534ded16d3af",
        "type": "github"
      },
      "original": {
@ -605,11 +605,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1728729581,
-        "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
+        "lastModified": 1729509737,
+        "narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
+        "rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037",
        "type": "github"
      },
      "original": {
@ -688,11 +688,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1728909085,
-        "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
+        "lastModified": 1729307008,
+        "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
+        "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
        "type": "github"
      },
      "original": {
@ -720,11 +720,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1728888510,
-        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "lastModified": 1729256560,
+        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
        "type": "github"
      },
      "original": {
@ -736,11 +736,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1728888510,
-        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "lastModified": 1729256560,
+        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
        "type": "github"
      },
      "original": {
@ -752,11 +752,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1728888510,
-        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "lastModified": 1729256560,
+        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
        "type": "github"
      },
      "original": {
@ -832,11 +832,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1729415156,
-        "narHash": "sha256-Ha5CqNs+mFMzf5O2HVfs9mxqIQnBwt+srspiQWAvN/A=",
+        "lastModified": 1729516261,
+        "narHash": "sha256-uvW3pAtku4QrCjkThTFwJjLmS5evHPSH6XBGZFHGquA=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "fdda803471577189005bac0b4bc934689f52ef59",
+        "rev": "282dfd5c7da86c7315c231b95e95d71b36f22347",
        "type": "github"
      },
      "original": {
@ -981,11 +981,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729098898,
-        "narHash": "sha256-poRon0EwKWfOfttFk/8IiUPzCO/ahpNvtsSd9lizlHY=",
+        "lastModified": 1729372184,
+        "narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "508a077405fa700de0248e7f84bc4fefbd308dd9",
+        "rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1",
        "type": "github"
      },
      "original": {
@ -2846,11 +2846,11 @@
        "nixpkgs": "nixpkgs_8"
      },
      "locked": {
-        "lastModified": 1729077719,
-        "narHash": "sha256-zayHqZO9gA1U85c4CPvVSnLV8/cBgc2yVrSKWaKeBUs=",
+        "lastModified": 1729242555,
+        "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "5307ba60125bb024d7e52d71d582eafd511f3fee",
+        "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
        "type": "github"
      },
      "original": {
@ -2923,11 +2923,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1726378112,
-        "narHash": "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY=",
+        "lastModified": 1729139001,
+        "narHash": "sha256-BADKw4fQma8tUNBRfmS9YLXTRXK4nYyXIxQdhGuEV0s=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "b962a0f33b503aa39c9cf6919f488b664e5b79b4",
+        "rev": "ab2d09962c425670a4a7ca6ef5d92a0f06632499",
        "type": "github"
      },
      "original": {
--- a/home/default.nix
+++ b/home/default.nix
@ -1,6 +1,8 @@
 {
  imports = [
+    ./services/udiskie.nix
    ./terminal
+    ./programs
  ];
  home = {
    username = "nezia";
--- a/home/profiles/default.nix
+++ b/home/profiles/default.nix
@ -1,10 +0,0 @@
-{
-  vamos = [
-    ../.
-    ./vamos
-  ];
-  solaire = [
-    ../.
-    ./solaire
-  ];
-}
--- a/home/profiles/solaire/default.nix
+++ b/home/profiles/solaire/default.nix
@ -1,11 +0,0 @@
-{self, ...}: {
-  imports = [
-    "${self}/home/services/udiskie.nix"
-
-    "${self}/home/programs"
-
-    "${self}/home/terminal/emulators/foot.nix"
-    "${self}/home/programs/editors/neovim.nix"
-    "${self}/home/programs/editors/helix.nix"
-  ];
-}
--- a/home/profiles/vamos/default.nix
+++ b/home/profiles/vamos/default.nix
@ -1,19 +0,0 @@
-{self, ...}: {
-  imports = [
-    "${self}/home/services/udiskie.nix"
-
-    "${self}/home/programs"
-
-    "${self}/home/programs/niri"
-    "${self}/home/programs/ags"
-    "${self}/home/programs/fuzzel.nix"
-    "${self}/home/programs/swaybg.nix"
-    "${self}/home/programs/swaylock.nix"
-    "${self}/home/programs/swayidle.nix"
-
-    "${self}/home/terminal/emulators/foot.nix"
-
-    "${self}/home/programs/editors/neovim.nix"
-    "${self}/home/programs/editors/helix.nix"
-  ];
-}
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@ -4,8 +4,11 @@
    ./media
    ./xdg.nix
    ./gtk.nix
+    ./editors/neovim.nix
+    ./editors/helix.nix
  ];

+  # idk where to put this
  programs = {
    fzf.enable = true;
    hyfetch.enable = true;
@ -15,6 +18,7 @@
    };
  };

+  # miscellaneous programs that do not need to be configured
  home.packages = with pkgs; [
    geary
    imhex
--- a/hosts/default.nix
+++ b/hosts/default.nix
@ -5,76 +5,45 @@
 }: {
  flake.nixosConfigurations = let
    inherit (inputs.nixpkgs.lib) nixosSystem;
-    homeImports = import "${self}/home/profiles";
-    mod = "${self}/system";
-    inherit (import mod) laptop desktop;
    specialArgs = {
      inherit inputs self;
    };
  in {
    vamos = nixosSystem {
      inherit specialArgs;
-      modules =
-        laptop
-        ++ [
-          ./vamos
-          "${mod}/core/lanzaboote.nix"
+      modules = [
+        ./vamos

-          "${mod}/services/greetd.nix"
-          "${mod}/programs/niri"
-          "${mod}/services/gnome.nix"
-          "${mod}/services/mail.nix"
+        self.nixosModules.style

-          self.nixosModules.style
-
-          ({pkgs, ...}: {
-            style = let
-              wallpaper = pkgs.fetchurl {
-                url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/e0cf0eb237dc5baba86661a3572b20a6183c1876/wallpapers/nix-wallpaper-nineish-catppuccin-frappe.png?raw=true";
-                hash = "sha256-/HAtpGwLxjNfJvX5/4YZfM8jPNStaM3gisK8+ImRmQ4=";
-              };
-            in {
-              gtk.enable = true;
-              inherit wallpaper;
+        ({pkgs, ...}: {
+          style = let
+            wallpaper = pkgs.fetchurl {
+              url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/e0cf0eb237dc5baba86661a3572b20a6183c1876/wallpapers/nix-wallpaper-nineish-catppuccin-frappe.png?raw=true";
+              hash = "sha256-/HAtpGwLxjNfJvX5/4YZfM8jPNStaM3gisK8+ImRmQ4=";
            };
-          })
-          {
-            home-manager = {
-              users.nezia.imports = homeImports.vamos;
-              extraSpecialArgs = specialArgs;
-            };
-          }
+          in {
+            gtk.enable = true;
+            inherit wallpaper;
+          };
+        })

-          inputs.nixos-hardware.nixosModules.framework-13-7040-amd
-        ];
+        inputs.nixos-hardware.nixosModules.framework-13-7040-amd
+      ];
    };

    solaire = nixosSystem {
      inherit specialArgs;
-      modules =
-        desktop
-        ++ [
-          ./solaire
-
-          "${mod}/programs/gnome.nix"
-
-          "${mod}/hardware/nvidia.nix"
-          "${mod}/programs/games.nix"
-
-          self.nixosModules.style
-          {
-            style = {
-              gtk.enable = false;
-              wallpaper = ../wallpapers/lucy-edgerunners-wallpaper.jpg;
-            };
-          }
-          {
-            home-manager = {
-              users.nezia.imports = homeImports.solaire;
-              extraSpecialArgs = specialArgs;
-            };
-          }
-        ];
+      modules = [
+        ./solaire
+        self.nixosModules.style
+        {
+          style = {
+            gtk.enable = false;
+            wallpaper = ../wallpapers/lucy-edgerunners-wallpaper.jpg;
+          };
+        }
+      ];
    };
  };
 }
--- a/hosts/solaire/default.nix
+++ b/hosts/solaire/default.nix
@ -1,7 +1,30 @@
-{pkgs, ...}: {
+{
+  self,
+  specialArgs,
+  ...
+}: let
+  mod = "${self}/system";
+in {
  imports = [
    ./hardware-configuration.nix
+
+    "${mod}"
+    "${mod}/hardware/uni-sync.nix"
+
+    "${mod}/programs/gnome.nix"
+    "${mod}/programs/games.nix"
+    "${mod}/hardware/nvidia.nix"
  ];
+
+  home-manager = {
+    users.nezia.imports = [
+      "${self}/home"
+
+      "${self}/home/terminal/emulators/foot.nix"
+    ];
+    extraSpecialArgs = specialArgs;
+  };
+
  networking.hostName = "solaire";
  environment.variables.FLAKE = "/home/nezia/.dotfiles";
 }
--- a/hosts/vamos/default.nix
+++ b/hosts/vamos/default.nix
@ -1,7 +1,46 @@
-{lib, ...}: {
+{
+  self,
+  specialArgs,
+  ...
+}: let
+  mod = "${self}/system";
+in {
  imports = [
    ./hardware-configuration.nix
+
+    "${mod}"
+    "${mod}/core/lanzaboote.nix"
+
+    "${mod}/hardware/fprintd.nix"
+    "${mod}/services/power.nix"
+    "${mod}/services/brightness.nix"
+    "${mod}/services/keyd.nix"
+
+    "${mod}/services/logind.nix"
+    "${mod}/services/greetd.nix"
+
+    "${mod}/programs/niri"
+    "${mod}/services/gnome.nix"
+    "${mod}/services/mail.nix"
  ];
+
+  home-manager = {
+    users.nezia.imports = [
+      "${self}/home"
+      "${self}/home/services/udiskie.nix"
+
+      "${self}/home/programs/niri"
+      "${self}/home/programs/ags"
+      "${self}/home/programs/fuzzel.nix"
+      "${self}/home/programs/swaybg.nix"
+      "${self}/home/programs/swaylock.nix"
+      "${self}/home/programs/swayidle.nix"
+
+      "${self}/home/terminal/emulators/foot.nix"
+    ];
+    extraSpecialArgs = specialArgs;
+  };
+
  networking.hostName = "vamos";
  environment.variables.FLAKE = "/home/nezia/.dotfiles";
 }
--- a/system/default.nix
+++ b/system/default.nix
@ -1,6 +1,7 @@
-let
-  common = [
+{
+  imports = [
    ./core
+
    ./hardware/printing.nix
    ./hardware/fwupd.nix

@ -10,21 +11,4 @@ let

    ./services
  ];
-  desktop =
-    common
-    ++ [
-      ./hardware/uni-sync.nix
-    ];
-
-  laptop =
-    common
-    ++ [
-      ./hardware/fprintd.nix
-      ./services/power.nix
-      ./services/brightness.nix
-      ./services/keyd.nix
-      ./services/logind.nix
-    ];
-in {
-  inherit desktop laptop;
 }
--- a/system/nix/nixpkgs.nix
+++ b/system/nix/nixpkgs.nix
@ -10,6 +10,6 @@
          };
      })
    ];
-    config.permittedInsecurePackages = ["cinny-4.2.1" "cinny-unwrapped-4.2.1"];
+    config.permittedInsecurePackages = ["cinny-4.2.2" "cinny-unwrapped-4.2.2"];
  };
 }
Author	SHA1	Message	Date
Anthony Rodriguez	f60d03acf6	flake: update dependencies	2024-10-21 16:02:55 +02:00
Anthony Rodriguez	8c3cd9631a	repo: move common home packages into home/default.nix	2024-10-21 15:49:07 +02:00
Anthony Rodriguez	aa46aa0762	repo: refactor to remove home/profiles Removed the profiles directory in home, as I thought it was redundant: they had the same name as my hostnames, as all my machines are single-user only. Therefore, everything is now under its own hosts/{hostname}, and flake.nix just has to import hosts/default.nix like it did before.	2024-10-21 15:34:23 +02:00