nki/nix-home
1
0
Fork 0
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: nki:a3d59d71ecd8779830817f42833f7fc7f67eeae4
Branches Tags
nki:master
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test
..
compare: nki:59c25c883a328b2a772232b0fef00e8575ec7050
Branches Tags
nki:master
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test

No commits in common. "a3d59d71ecd8779830817f42833f7fc7f67eeae4" and "59c25c883a328b2a772232b0fef00e8575ec7050" have entirely different histories.
a3d59d71ec ... 59c25c883a

3 changed files with 75 additions and 158 deletions
Show stats Expand all files Collapse all files

112
flake.lock
View file

@ -480,24 +480,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_10": {
"inputs": {
"systems": "systems_9"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -607,24 +589,6 @@
} }
}, },
"flake-utils_8": { "flake-utils_8": {
"inputs": {
"systems": "systems_8"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_9": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -639,18 +603,21 @@
"type": "github" "type": "github"
} }
}, },
"flakey-profile": { "flake-utils_9": {
"inputs": {
"systems": "systems_8"
},
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1710146030,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "lf-", "owner": "numtide",
"repo": "flakey-profile", "repo": "flake-utils",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "lf-", "owner": "numtide",
"repo": "flakey-profile", "repo": "flake-utils",
"type": "github" "type": "github"
} }
}, },
@ -850,44 +817,9 @@
"type": "github" "type": "github"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1720626042,
"narHash": "sha256-f8k+BezKdJfmE+k7zgBJiohtS3VkkriycdXYsKOm3sc=",
"rev": "2a4376be20d70feaa2b0e640c5041fb66ddc67ed",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a4376be20d70feaa2b0e640c5041fb66ddc67ed.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.90.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils_7",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1720641669,
"narHash": "sha256-yEO2cGNgzm9x/XxiDQI+WckSWnZX63R8aJLBRSXtYNE=",
"rev": "5c48c833c15bb80d127a398a8c2484d42fdd8257",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5c48c833c15bb80d127a398a8c2484d42fdd8257.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz"
}
},
"mpd-mpris": { "mpd-mpris": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_8", "flake-utils": "flake-utils_7",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -1297,7 +1229,6 @@
"kak-lsp": "kak-lsp", "kak-lsp": "kak-lsp",
"kakoune": "kakoune", "kakoune": "kakoune",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"lix-module": "lix-module",
"mpd-mpris": "mpd-mpris", "mpd-mpris": "mpd-mpris",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
@ -1414,7 +1345,7 @@
}, },
"secrets": { "secrets": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_9" "flake-utils": "flake-utils_8"
}, },
"locked": { "locked": {
"lastModified": 1693981285, "lastModified": 1693981285,
@ -1594,21 +1525,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_9": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_3"
@ -1630,7 +1546,7 @@
"youmubot": { "youmubot": {
"inputs": { "inputs": {
"crane": "crane_5", "crane": "crane_5",
"flake-utils": "flake-utils_10", "flake-utils": "flake-utils_9",
"nixpkgs": "nixpkgs_11" "nixpkgs": "nixpkgs_11"
}, },
"locked": { "locked": {

114
flake.nix
View file

@ -27,10 +27,6 @@
flake-utils.url = github:numtide/flake-utils; flake-utils.url = github:numtide/flake-utils;
crane.url = github:ipetkov/crane; crane.url = github:ipetkov/crane;
arion.url = github:hercules-ci/arion; arion.url = github:hercules-ci/arion;
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
# --- # ---
# Imported apps # Imported apps
@ -65,6 +61,8 @@
overlays = import ./overlay.nix inputs; overlays = import ./overlay.nix inputs;
lib = nixpkgs.lib; lib = nixpkgs.lib;
hmOf = nixpkgs: if nixpkgs == inputs.nixpkgs then home-manager else inputs.home-manager-unstable;
applyOverlays = { ... }: { applyOverlays = { ... }: {
nixpkgs.overlays = lib.mkBefore overlays; nixpkgs.overlays = lib.mkBefore overlays;
}; };
@ -93,7 +91,6 @@
(nixpkgsAsRegistry_ stable) (nixpkgsAsRegistry_ stable)
./common.nix ./common.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
inputs.lix-module.nixosModules.default
]; ];
}; };
common-nixos = stable: { ... }: { common-nixos = stable: { ... }: {
@ -106,35 +103,6 @@
]; ];
}; };
mkPersonalSystem = nixpkgs-module: system: { configuration
, homeManagerUsers ? { }
, extraModules ? [ ]
, includeCommonModules ? true
,
}:
let
home-manager-module =
if nixpkgs-module == inputs.nixpkgs then inputs.home-manager
else if nixpkgs-module == inputs.nixpkgs-unstable then inputs.home-manager-unstable
else builtins.abort "Unknown nixpkgs module, use `nixpkgs` or `nixpkgs-unstable`";
in
nixpkgs-module.lib.nixosSystem {
inherit system;
modules =
(if includeCommonModules then [
(common-nixos nixpkgs-module)
] else [ ]) ++ [
configuration
# Home Manager
home-manager-module.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users = homeManagerUsers;
}
] ++ extraModules;
};
in in
{ {
overlays.default = lib.composeManyExtensions overlays; overlays.default = lib.composeManyExtensions overlays;
@ -158,16 +126,29 @@
}; };
# Home configuration # Home configuration
nixosConfigurations."kagamiPC" = mkPersonalSystem nixpkgs-unstable "x86_64-linux" { nixosConfigurations."kagamiPC" = nixpkgs.lib.nixosSystem rec {
configuration = ./nki-home/configuration.nix; system = "x86_64-linux";
homeManagerUsers.nki = import ./home/kagami-pc-home.nix; modules = [
extraModules = [ osuStable ]; (common-nixos nixpkgs)
./nki-home/configuration.nix
osuStable
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.nki = { ... }: {
imports = [
./home/kagami-pc-home.nix
];
};
}
];
}; };
# yoga g8 configuration # yoga g8 configuration
nixosConfigurations."nki-yoga-g8" = mkPersonalSystem nixpkgs "x86_64-linux" { nixosConfigurations."nki-yoga-g8" = nixpkgs.lib.nixosSystem rec {
configuration = ./nki-yoga-g8/configuration.nix; system = "x86_64-linux";
homeManagerUsers.nki = import ./home/nki-x1c1.nix; modules = [
extraModules = [ (common-nixos nixpkgs)
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
({ ... }: { ({ ... }: {
# Sets up secure boot # Sets up secure boot
@ -177,13 +158,20 @@
pkiBundle = "/etc/secureboot"; pkiBundle = "/etc/secureboot";
}; };
}) })
./nki-yoga-g8/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.nki = import ./home/nki-x1c1.nix;
}
]; ];
}; };
# framework configuration # framework configuration
nixosConfigurations."nki-framework" = mkPersonalSystem nixpkgs-unstable "x86_64-linux" { nixosConfigurations."nki-framework" = nixpkgs-unstable.lib.nixosSystem rec {
configuration = ./nki-framework/configuration.nix; system = "x86_64-linux";
homeManagerUsers.nki = import ./home/nki-framework.nix; modules = [
extraModules = [ (common-nixos nixpkgs-unstable)
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
inputs.nixos-hardware.nixosModules.framework-13-7040-amd inputs.nixos-hardware.nixosModules.framework-13-7040-amd
({ ... }: { ({ ... }: {
@ -194,21 +182,41 @@
pkiBundle = "/etc/secureboot"; pkiBundle = "/etc/secureboot";
}; };
}) })
./nki-framework/configuration.nix
(hmOf nixpkgs-unstable).nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup";
home-manager.users.nki = import ./home/nki-framework.nix;
}
]; ];
}; };
# macbook nixos # macbook nixos
nixosConfigurations."kagami-air-m1" = mkPersonalSystem nixpkgs "aarch64-linux" { nixosConfigurations."kagami-air-m1" = inputs.nixpkgs.lib.nixosSystem rec {
configuration = ./kagami-air-m1/configuration.nix; system = "aarch64-linux";
homeManagerUsers.nki = import ./home/macbook-nixos.nix; modules = [
extraModules = [ inputs.nixos-m1.nixosModules.apple-silicon-support ]; (common-nixos inputs.nixpkgs)
inputs.nixos-m1.nixosModules.apple-silicon-support
./kagami-air-m1/configuration.nix
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.nki = import ./home/macbook-nixos.nix;
}
];
}; };
# DigitalOcean node # DigitalOcean node
nixosConfigurations."nki-personal-do" = mkPersonalSystem nixpkgs "x86_64-linux" { nixosConfigurations."nki-personal-do" = nixpkgs.lib.nixosSystem rec {
configuration = ./nki-personal-do/configuration.nix; system = "x86_64-linux";
modules = [ modules = [
(common-nixos nixpkgs)
inputs.arion.nixosModules.arion inputs.arion.nixosModules.arion
./modules/my-tinc
inputs.youmubot.nixosModules.default inputs.youmubot.nixosModules.default
./nki-personal-do/configuration.nix
inputs.secrets.nixosModules.nki-personal-do inputs.secrets.nixosModules.nki-personal-do
]; ];
}; };
@ -223,8 +231,8 @@
# This is highly advised, and will prevent many possible mistakes # This is highly advised, and will prevent many possible mistakes
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
} // (inputs.flake-utils.lib.eachDefaultSystem (system: { } // (inputs.flake-utils.lib.eachDefaultSystem (system: {
formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt; formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
})); }));
} }

7
home/modules/programs/my-sway/default.nix
View file

@ -45,12 +45,6 @@ let
${pkgs.grim}/bin/grim -g (${pkgs.slurp}/bin/slurp) - | ${pkgs.swappy}/bin/swappy -f - ${pkgs.grim}/bin/grim -g (${pkgs.slurp}/bin/slurp) - | ${pkgs.swappy}/bin/swappy -f -
''; '';
rofi-rbw-script = pkgs.writeShellApplication {
name = "rofi-rbw-script";
runtimeInputs = with pkgs; [ rofi wtype rofi-rbw ];
text = "rofi-rbw";
};
ignored-devices = [ "Surface_Headphones" ]; ignored-devices = [ "Surface_Headphones" ];
playerctl = "${pkgs.playerctl}/bin/playerctl --ignore-player=${strings.concatStringsSep "," ignored-devices}"; playerctl = "${pkgs.playerctl}/bin/playerctl --ignore-player=${strings.concatStringsSep "," ignored-devices}";
@ -220,7 +214,6 @@ in
# Launcher # Launcher
"${mod}+space" = "exec rofi -show drun"; "${mod}+space" = "exec rofi -show drun";
"${mod}+tab" = "exec ${./rofi-window.py}"; "${mod}+tab" = "exec ${./rofi-window.py}";
"${mod}+shift+p" = "exec ${lib.getExe rofi-rbw-script}";
} // { } // {
## Splits ## Splits
"${mod}+v" = "split v"; "${mod}+v" = "split v";