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

Full speed ahead to 22.11-

Browse source
This commit is contained in:
Natsu Kagami 2022-12-05 10:59:59 +01:00
parent fef90d202c
commit 659ad9e6a3
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
6 changed files with 51 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
flake.lock
View file

@ -160,19 +160,20 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1668081054, "lastModified": 1670232440,
"narHash": "sha256-1dPcjSZma1deCOcVkkCBCfrAN8XOJJItS9FGcJNT/eM=", "narHash": "sha256-bPTUa2Vn+DAhkgQHh+1YbD77Ahu+p7PgmyRkc/dInCU=",
"owner": "natsukagami", "owner": "natsukagami",
"repo": "home-manager", "repo": "home-manager",
"rev": "6844b4054680740072798552e62477433e128e88", "rev": "63099f1b21ec4a18c8ab616bcbe7ed4bcdb640da",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "natsukagami", "owner": "natsukagami",
"ref": "release-22.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -303,22 +304,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-2211": {
"locked": {
"lastModified": 1669834992,
"narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-mozilla": { "nixpkgs-mozilla": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -384,16 +369,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1669152211, "lastModified": 1670104339,
"narHash": "sha256-mBLiTNTzrtlYPHF0bL8NeGA4n8K5b35fYVdqaTIIkgc=", "narHash": "sha256-212aAMSy5uxzrUbHmvUm3oHh8c02wXJ7lyNjDa5NSAM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "56ca700ceabcfa15396bcf581a1296e8e27ad677", "rev": "2d10e73416ec1449ef74aeac7faf2cf8c556ff5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-22.05", "ref": "nixos-22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -433,7 +418,7 @@
"inputs": { "inputs": {
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"utils": "utils_2" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1666639010, "lastModified": 1666639010,
@ -461,7 +446,6 @@
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixos-m1": "nixos-m1", "nixos-m1": "nixos-m1",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-2211": "nixpkgs-2211",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"rnix-lsp": "rnix-lsp", "rnix-lsp": "rnix-lsp",
@ -518,16 +502,16 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
"nixpkgs-22_05": [ "nixpkgs-stable": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1668915833, "lastModified": 1670149631,
"narHash": "sha256-7VYPiDJZdGct8Nl3kKhg580XZfoRcViO+zUGPkfBsqM=", "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f72e050c3ef148b1131a0d2df55385c045e4166b", "rev": "da98a111623101c64474a14983d83dad8f09f93d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -552,6 +536,21 @@
} }
}, },
"utils_2": { "utils_2": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_3": {
"locked": { "locked": {
"lastModified": 1656928814, "lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",

16
flake.nix
View file

@ -2,16 +2,15 @@
description = "nki's systems"; description = "nki's systems";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs-2211.url = "github:nixos/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
darwin.url = "github:lnl7/nix-darwin/master"; darwin.url = "github:lnl7/nix-darwin/master";
darwin.inputs.nixpkgs.follows = "nixpkgs-unstable"; darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
home-manager.url = "github:natsukagami/home-manager/release-22.05"; home-manager.url = "github:natsukagami/home-manager/release-22.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable"; sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
sops-nix.inputs.nixpkgs-22_05.follows = "nixpkgs"; sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
deploy-rs.url = "github:Serokell/deploy-rs"; deploy-rs.url = "github:Serokell/deploy-rs";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -45,7 +44,6 @@
overlays = import ./overlay.nix inputs; overlays = import ./overlay.nix inputs;
pkgs' = system: import nixpkgs { inherit system overlays; config.allowUnfree = true; }; pkgs' = system: import nixpkgs { inherit system overlays; config.allowUnfree = true; };
pkgs-2211 = system: import inputs.nixpkgs-2211 { inherit system overlays; config.allowUnfree = true; };
pkgs-unstable = system: import nixpkgs-unstable { inherit system overlays; config.allowUnfree = true; }; pkgs-unstable = system: import nixpkgs-unstable { inherit system overlays; config.allowUnfree = true; };
nixpkgsAsRegistry_ = stable: { ... }: { nixpkgsAsRegistry_ = stable: { ... }: {
@ -109,9 +107,9 @@
}; };
# Home configuration # Home configuration
nixosConfigurations."nki-home" = inputs.nixpkgs-2211.lib.nixosSystem rec { nixosConfigurations."nki-home" = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = pkgs-2211 system; pkgs = pkgs' system;
modules = [ modules = [
./modules/my-tinc ./modules/my-tinc
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
@ -165,8 +163,8 @@
}; };
# DigitalOcean node # DigitalOcean node
nixosConfigurations."nki-personal-do" = inputs.nixpkgs-2211.lib.nixosSystem rec { nixosConfigurations."nki-personal-do" = nixpkgs.lib.nixosSystem rec {
pkgs = pkgs-2211 system; pkgs = pkgs' system;
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./modules/my-tinc ./modules/my-tinc

2
home/modules/linux/graphical/default.nix
View file

@ -33,7 +33,7 @@ in
## CLI stuff ## CLI stuff
dex # .desktop file management, startup dex # .desktop file management, startup
sct # Display color temperature # sct # Display color temperature
xdg-utils # Open stuff xdg-utils # Open stuff
] ++ (if pkgs.stdenv.isAarch64 then [ ] else [ ] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
mailspring mailspring

2
home/modules/linux/graphical/x11.nix
View file

@ -36,7 +36,7 @@ with lib;
# Picom: X Compositor # Picom: X Compositor
services.picom = mkIf (!cfg.hasDE) { services.picom = mkIf (!cfg.hasDE) {
enable = true; enable = true;
blur = true; # blur = true;
fade = true; fade = true;
fadeDelta = 3; fadeDelta = 3;
shadow = true; shadow = true;

6
home/modules/programs/my-broot.nix
View file

@ -13,9 +13,9 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.broot = { programs.broot = {
enable = true; enable = true;
modal = true; settings.modal = true;
verbs = [ settings.verbs = [
{ {
invocation = "edit"; invocation = "edit";
key = "enter"; key = "enter";
@ -25,7 +25,7 @@ in
} }
]; ];
skin = { settings.skin = {
default = "none none"; default = "none none";
tree = "gray(7) None / gray(18) None"; tree = "gray(7) None / gray(18) None";
file = "gray(3) None / gray(8) None"; file = "gray(3) None / gray(8) None";

18
kagami-air-m1/configuration.nix
View file

@ -111,15 +111,15 @@
services.xserver.libinput.enable = true; services.xserver.libinput.enable = true;
# Keyboard # Keyboard
services.input-remapper.enable = true; services.input-remapper.enable = true;
services.input-remapper.package = pkgs.input-remapper.overridePythonAttrs { # services.input-remapper.package = pkgs.input-remapper.overridePythonAttrs {
src = pkgs.fetchFromGitHub { # src = pkgs.fetchFromGitHub {
owner = "sezanzeb"; # owner = "sezanzeb";
repo = "input-remapper"; # repo = "input-remapper";
rev = "ac07769854b5c0b3d5e99ee130516243699687ed"; # rev = "ac07769854b5c0b3d5e99ee130516243699687ed";
sha256 = "sha256-/Jh2hXcv8NSceYoobSqugWwX8jUf+FP1i922Ufp2H9w="; # sha256 = "sha256-/Jh2hXcv8NSceYoobSqugWwX8jUf+FP1i922Ufp2H9w=";
# sha256 = lib.fakeSha256; # # sha256 = lib.fakeSha256;
}; # };
}; # };
services.input-remapper.serviceWantedBy = [ "multi-user.target" ]; services.input-remapper.serviceWantedBy = [ "multi-user.target" ];
hardware.uinput.enable = true; hardware.uinput.enable = true;
hardware.opengl.enable = true; hardware.opengl.enable = true;