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

Update to nixos 21.11

Browse source
This commit is contained in:
Natsu Kagami 2021-12-01 13:52:13 -05:00
parent 476c25ba26
commit c41c05f45a
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
6 changed files with 30 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
flake.lock
View file

@ -72,37 +72,18 @@
"type": "github" "type": "github"
} }
}, },
"home-manager-21_05": { "home-manager": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1634544068,
"narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-21.05",
"repo": "home-manager",
"type": "github"
}
},
"home-manager-21_11": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-21_11" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1637917557, "lastModified": 1638267006,
"narHash": "sha256-3u5bLyGn5NUG3RJA7/v1Bqa/QCFGqp/01Bh/4REf9m4=", "narHash": "sha256-heZdDlD09rnoeEiZ4wKfbXNDkO5I9qVFvX9d790h/XE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4daff26495ca9ac67476cba8cf15c3e36d91ab18", "rev": "3e93c4e8b2b479c712b7c20a428993b459118842",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,7 +95,7 @@
}, },
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1635444951, "lastModified": 1635444951,
@ -132,7 +113,7 @@
}, },
"naersk_2": { "naersk_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1635777496, "lastModified": 1635777496,
@ -164,22 +145,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-21_11": {
"locked": {
"lastModified": 1638239011,
"narHash": "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1637831627, "lastModified": 1637831627,
@ -197,20 +162,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1635471979,
"narHash": "sha256-qlpiKdJ5gF7hU1TuNoz4xTsroUSrdErwovu3rD5cy2c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3f33a306a55bd7ecedf586a627063a211ffdc6f0",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1635527206, "lastModified": 1635527206,
"narHash": "sha256-vuktnugcLNX5HFpj8nVSKgojRDYQlxtKtcYWtOveegE=", "narHash": "sha256-vuktnugcLNX5HFpj8nVSKgojRDYQlxtKtcYWtOveegE=",
@ -224,23 +175,23 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1622516815, "lastModified": 1638239011,
"narHash": "sha256-ZjBd81a6J3TwtlBr3rHsZspYUwT9OdhDk+a/SgSEf7I=", "narHash": "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e9b0dff974c89e070da1ad85713ff3c20b0ca97", "rev": "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "21.05", "ref": "21.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1625223284, "lastModified": 1625223284,
"narHash": "sha256-jjLcDSU1rRiJb+n3uez23XAa7kbnPcGZTa6jIKh1GMQ=", "narHash": "sha256-jjLcDSU1rRiJb+n3uez23XAa7kbnPcGZTa6jIKh1GMQ=",
@ -256,7 +207,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1635956637, "lastModified": 1635956637,
"narHash": "sha256-65J/mVWr0M1y/59QOGSq6jOqiYYo6zoURJqdc0EzSZA=", "narHash": "sha256-65J/mVWr0M1y/59QOGSq6jOqiYYo6zoURJqdc0EzSZA=",
@ -270,7 +221,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_7": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1635956637, "lastModified": 1635956637,
"narHash": "sha256-65J/mVWr0M1y/59QOGSq6jOqiYYo6zoURJqdc0EzSZA=", "narHash": "sha256-65J/mVWr0M1y/59QOGSq6jOqiYYo6zoURJqdc0EzSZA=",
@ -327,11 +278,9 @@
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"home-manager-21_05": "home-manager-21_05", "home-manager": "home-manager",
"home-manager-21_11": "home-manager-21_11",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nixpkgs-21_11": "nixpkgs-21_11",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"rnix-lsp": "rnix-lsp", "rnix-lsp": "rnix-lsp",
@ -357,7 +306,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1633273832, "lastModified": 1633273832,
@ -407,7 +356,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"naersk": "naersk_2", "naersk": "naersk_2",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1637534778, "lastModified": 1637534778,

14
flake.nix
View file

@ -2,14 +2,12 @@
description = "nki's systems"; description = "nki's systems";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/21.05"; nixpkgs.url = "github:nixos/nixpkgs/21.11";
nixpkgs-21_11.url = "github:nixos/nixpkgs/21.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-21_11.url = "github:nix-community/home-manager/release-21.11"; home-manager.url = "github:nix-community/home-manager/release-21.11";
home-manager-21_11.inputs.nixpkgs.follows = "nixpkgs-21_11"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager-21_05.url = "github:nix-community/home-manager/release-21.05";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
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";
@ -27,7 +25,7 @@
secrets.url = "git+ssh://git@github.com/natsukagami/nix-deploy-secrets"; secrets.url = "git+ssh://git@github.com/natsukagami/nix-deploy-secrets";
}; };
outputs = { self, darwin, nixpkgs, nixpkgs-unstable, home-manager-21_11, home-manager-21_05, deploy-rs, sops-nix, nur, ... }@inputs: outputs = { self, darwin, nixpkgs, nixpkgs-unstable, home-manager, deploy-rs, sops-nix, nur, ... }@inputs:
let let
overlayForSystem = import ./overlay.nix inputs; overlayForSystem = import ./overlay.nix inputs;
in in
@ -37,7 +35,7 @@
system = "aarch64-darwin"; system = "aarch64-darwin";
modules = [ modules = [
./darwin/configuration.nix ./darwin/configuration.nix
home-manager-21_11.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
@ -54,7 +52,7 @@
./modules/my-tinc ./modules/my-tinc
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
./nki-home/configuration.nix ./nki-home/configuration.nix
home-manager-21_05.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;

11
home/common.nix
View file

@ -99,15 +99,8 @@
gh = { gh = {
enable = true; enable = true;
} // ( settings.git_protocol = "ssh";
let };
protocol = "ssh";
in
if (config.home.stateVersion == "21.05") then
{ gitProtocol = "ssh"; }
else
{ settings.git_protocol = protocol; }
);
git = { git = {
enable = true; enable = true;

6
home/kakoune/kak-lsp.nix
View file

@ -18,11 +18,7 @@ let
cargoDeps = drv.cargoDeps.overrideAttrs (lib.const { cargoDeps = drv.cargoDeps.overrideAttrs (lib.const {
inherit src; inherit src;
outputHash = ( outputHash = "sha256-U5hiEak47Dd/R7II6d+0/n3ZmT1ryDk4S+/lV2cH6HM=";
if pkgs.stdenv.isDarwin
then "sha256-U5hiEak47Dd/R7II6d+0/n3ZmT1ryDk4S+/lV2cH6HM="
else "0ywb9489jrb5lsycxlxzrj2khkcjhvzxbb0ckbpwwvg11r4ds240"
);
}); });
}); });

13
home/modules/X11/xfce4-notifyd.nix
View file

@ -8,17 +8,6 @@ in
options.services.X11.xfce4-notifyd.enable = mkEnableOption "Notification Manager for xfce4"; options.services.X11.xfce4-notifyd.enable = mkEnableOption "Notification Manager for xfce4";
config = mkIf cfg.enable { config = mkIf cfg.enable {
xdg.configFile."autostart/xfce4-notifyd.desktop" = { home.packages = with pkgs; [ xfce.xfce4-notifyd ];
# Remove the "OnlyShowIn" line
source = pkgs.runCommand "xfce4-notifyd.desktop"
{
buildInput = [ pkgs.gnused ];
preferLocalBuild = true;
} ''
sed "s/OnlyShowIn/# OnlyShowIn/g" \
< ${pkgs.xfce.xfce4-notifyd}/etc/xdg/autostart/xfce4-notifyd.desktop \
> $out
'';
};
}; };
} }

2
nki-home/configuration.nix
View file

@ -120,7 +120,7 @@
pciutils pciutils
## Security stuff ## Security stuff
qtkeychain libsForQt5.qtkeychain
## Enable nix-flakes ## Enable nix-flakes
# (pkgs.writeShellScriptBin "nixFlakes" '' # (pkgs.writeShellScriptBin "nixFlakes" ''