nezia/flocon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

repo: remove home/profiles

Browse source 
commit f60d03acf6
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Mon Oct 21 16:02:55 2024 +0200

    flake: update dependencies

commit 8c3cd9631a
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Mon Oct 21 15:49:07 2024 +0200

    repo: move common home packages into home/default.nix

commit aa46aa0762
Author: Anthony Rodriguez <anthony@nezia.dev>
Date:   Mon Oct 21 15:34:23 2024 +0200

    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.
This commit is contained in:
Anthony Rodriguez 2024-10-21 16:37:58 +02:00
parent ac8fa51639
commit b255b3988b
Signed by: nezia
GPG key ID: EE3BE97C040A86CE
11 changed files with 144 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
flake.lock
View file

@ -47,11 +47,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1729092978, "lastModified": 1729510449,
"narHash": "sha256-2SMJFFgKSvrQfkfzdcYjwFGvgeoCtDdbl/CGZNIU7hs=", "narHash": "sha256-/EwjBMYBZ3/2ROT+4M/6tLomgJEgZBpKosWhqtYZkDI=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "9af42c96e8d666f1df2b087aba1a6349f1c22f4e", "rev": "4e03e8d762623ca925c604800aa18f109cd3bd97",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -361,11 +361,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728903686, "lastModified": 1729414726,
"narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "rev": "fe56302339bb28e3471632379d733547caec8103",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +381,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729027341, "lastModified": 1729459288,
"narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -403,11 +403,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728974938, "lastModified": 1729177642,
"narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=", "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "23170582b0658e6afd913149a58863af3a57b376", "rev": "bb69165ff372ddbd3228a03513922acd783040e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,11 +534,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1729090125, "lastModified": 1729499378,
"narHash": "sha256-jZQe55BWLEv6OwItbL7mMsm8A3/1rrLk4vTm3k7+jqg=", "narHash": "sha256-gslhStBw58+LAbcver/2/Q6zjPq9xNZQ/IcoIh7OBck=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "44d93e05a400cad197fd10f9d50e9475fc519326", "rev": "2e46e95f0e5be7cea740163d87edf628e755cc3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -567,11 +567,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729086716, "lastModified": 1729444736,
"narHash": "sha256-xF1AtbQ+ipQyzyXV8mWGlndbeqACM3IIadyCHO0OtpU=", "narHash": "sha256-/Q1yf6f9nUBFVqI/t89xfTPmQipaug63LP8TeENg4CA=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "84655d3b2627687e14431adb49450cd6af1de40f", "rev": "289ae3604d705cebc82cbcd23ee4534ded16d3af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -605,11 +605,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1728729581, "lastModified": 1729509737,
"narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -688,11 +688,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1728909085, "lastModified": 1729307008,
"narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -720,11 +720,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1728888510, "lastModified": 1729256560,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -736,11 +736,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1728888510, "lastModified": 1729256560,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -752,11 +752,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1728888510, "lastModified": 1729256560,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -832,11 +832,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1729415156, "lastModified": 1729516261,
"narHash": "sha256-Ha5CqNs+mFMzf5O2HVfs9mxqIQnBwt+srspiQWAvN/A=", "narHash": "sha256-uvW3pAtku4QrCjkThTFwJjLmS5evHPSH6XBGZFHGquA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "fdda803471577189005bac0b4bc934689f52ef59", "rev": "282dfd5c7da86c7315c231b95e95d71b36f22347",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -981,11 +981,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729098898, "lastModified": 1729372184,
"narHash": "sha256-poRon0EwKWfOfttFk/8IiUPzCO/ahpNvtsSd9lizlHY=", "narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "508a077405fa700de0248e7f84bc4fefbd308dd9", "rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2846,11 +2846,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1729077719, "lastModified": 1729242555,
"narHash": "sha256-zayHqZO9gA1U85c4CPvVSnLV8/cBgc2yVrSKWaKeBUs=", "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "5307ba60125bb024d7e52d71d582eafd511f3fee", "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2923,11 +2923,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726378112, "lastModified": 1729139001,
"narHash": "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY=", "narHash": "sha256-BADKw4fQma8tUNBRfmS9YLXTRXK4nYyXIxQdhGuEV0s=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "b962a0f33b503aa39c9cf6919f488b664e5b79b4", "rev": "ab2d09962c425670a4a7ca6ef5d92a0f06632499",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
home/default.nix
View file

@ -1,6 +1,8 @@
{ {
imports = [ imports = [
./services/udiskie.nix
./terminal ./terminal
./programs
]; ];
home = { home = {
username = "nezia"; username = "nezia";

10
home/profiles/default.nix
View file

@ -1,10 +0,0 @@
{
vamos = [
../.
./vamos
];
solaire = [
../.
./solaire
];
}

11
home/profiles/solaire/default.nix
View file

@ -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"
];
}

19
home/profiles/vamos/default.nix
View file

@ -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"
];
}

4
home/programs/default.nix
View file

@ -4,8 +4,11 @@
./media ./media
./xdg.nix ./xdg.nix
./gtk.nix ./gtk.nix
./editors/neovim.nix
./editors/helix.nix
]; ];
# idk where to put this
programs = { programs = {
fzf.enable = true; fzf.enable = true;
hyfetch.enable = true; hyfetch.enable = true;
@ -15,6 +18,7 @@
}; };
}; };
# miscellaneous programs that do not need to be configured
home.packages = with pkgs; [ home.packages = with pkgs; [
geary geary
imhex imhex

81
hosts/default.nix
View file

@ -5,76 +5,45 @@
}: { }: {
flake.nixosConfigurations = let flake.nixosConfigurations = let
inherit (inputs.nixpkgs.lib) nixosSystem; inherit (inputs.nixpkgs.lib) nixosSystem;
homeImports = import "${self}/home/profiles";
mod = "${self}/system";
inherit (import mod) laptop desktop;
specialArgs = { specialArgs = {
inherit inputs self; inherit inputs self;
}; };
in { in {
vamos = nixosSystem { vamos = nixosSystem {
inherit specialArgs; inherit specialArgs;
modules = modules = [
laptop ./vamos
++ [
./vamos
"${mod}/core/lanzaboote.nix"
"${mod}/services/greetd.nix" self.nixosModules.style
"${mod}/programs/niri"
"${mod}/services/gnome.nix"
"${mod}/services/mail.nix"
self.nixosModules.style ({pkgs, ...}: {
style = let
({pkgs, ...}: { wallpaper = pkgs.fetchurl {
style = let url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/e0cf0eb237dc5baba86661a3572b20a6183c1876/wallpapers/nix-wallpaper-nineish-catppuccin-frappe.png?raw=true";
wallpaper = pkgs.fetchurl { hash = "sha256-/HAtpGwLxjNfJvX5/4YZfM8jPNStaM3gisK8+ImRmQ4=";
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;
}; };
}) in {
{ gtk.enable = true;
home-manager = { inherit wallpaper;
users.nezia.imports = homeImports.vamos; };
extraSpecialArgs = specialArgs; })
};
}
inputs.nixos-hardware.nixosModules.framework-13-7040-amd inputs.nixos-hardware.nixosModules.framework-13-7040-amd
]; ];
}; };
solaire = nixosSystem { solaire = nixosSystem {
inherit specialArgs; inherit specialArgs;
modules = modules = [
desktop ./solaire
++ [ self.nixosModules.style
./solaire {
style = {
"${mod}/programs/gnome.nix" gtk.enable = false;
wallpaper = ../wallpapers/lucy-edgerunners-wallpaper.jpg;
"${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;
};
}
];
}; };
}; };
} }

25
hosts/solaire/default.nix
View file

@ -1,7 +1,30 @@
{pkgs, ...}: { {
self,
specialArgs,
...
}: let
mod = "${self}/system";
in {
imports = [ imports = [
./hardware-configuration.nix ./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"; networking.hostName = "solaire";
environment.variables.FLAKE = "/home/nezia/.dotfiles"; environment.variables.FLAKE = "/home/nezia/.dotfiles";
} }

41
hosts/vamos/default.nix
View file

@ -1,7 +1,46 @@
{lib, ...}: { {
self,
specialArgs,
...
}: let
mod = "${self}/system";
in {
imports = [ imports = [
./hardware-configuration.nix ./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"; networking.hostName = "vamos";
environment.variables.FLAKE = "/home/nezia/.dotfiles"; environment.variables.FLAKE = "/home/nezia/.dotfiles";
} }

22
system/default.nix
View file

@ -1,6 +1,7 @@
let {
common = [ imports = [
./core ./core
./hardware/printing.nix ./hardware/printing.nix
./hardware/fwupd.nix ./hardware/fwupd.nix
@ -10,21 +11,4 @@ let
./services ./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;
} }

2
system/nix/nixpkgs.nix
View file

@ -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"];
}; };
} }