Dandellion/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update to nixos-22.11

Browse Source
This commit is contained in:
Daniel Olsen 2022-12-01 21:14:53 +01:00
parent b9ea792ddc
commit b95ed726eb
5 changed files with 82 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
flake.lock generated
View File

@ -1,22 +1,5 @@
{ {
"nodes": { "nodes": {
"all-cabal-json": {
"flake": false,
"locked": {
"lastModified": 1665552503,
"narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=",
"owner": "nix-community",
"repo": "all-cabal-json",
"rev": "d7c0434eebffb305071404edcf9d5cd99703878e",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "hackage",
"repo": "all-cabal-json",
"type": "github"
}
},
"crane": { "crane": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -42,7 +25,7 @@
"locked": { "locked": {
"lastModified": 1656687988, "lastModified": 1656687988,
"narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=", "narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=",
"ref": "master", "ref": "refs/heads/master",
"rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03", "rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03",
"revCount": 160, "revCount": 160,
"type": "git", "type": "git",
@ -73,10 +56,12 @@
"inputs": { "inputs": {
"alejandra": [ "alejandra": [
"helix", "helix",
"nci", "nci"
"nixpkgs" ],
"all-cabal-json": [
"helix",
"nci"
], ],
"all-cabal-json": "all-cabal-json",
"crane": "crane", "crane": "crane",
"devshell": [ "devshell": [
"helix", "helix",
@ -85,19 +70,19 @@
], ],
"flake-utils-pre-commit": [ "flake-utils-pre-commit": [
"helix", "helix",
"nci", "nci"
"nixpkgs" ],
"ghc-utils": [
"helix",
"nci"
], ],
"ghc-utils": "ghc-utils",
"gomod2nix": [ "gomod2nix": [
"helix", "helix",
"nci", "nci"
"nixpkgs"
], ],
"mach-nix": [ "mach-nix": [
"helix", "helix",
"nci", "nci"
"nixpkgs"
], ],
"nixpkgs": [ "nixpkgs": [
"helix", "helix",
@ -106,21 +91,19 @@
], ],
"poetry2nix": [ "poetry2nix": [
"helix", "helix",
"nci", "nci"
"nixpkgs"
], ],
"pre-commit-hooks": [ "pre-commit-hooks": [
"helix", "helix",
"nci", "nci"
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1667429039, "lastModified": 1668851003,
"narHash": "sha256-Lu6da25JioHzerkLHAHSO9suCQFzJ/XBjkcGCIbasLM=", "narHash": "sha256-X7RCQQynbxStZR2m7HW38r/msMQwVl3afD6UXOCtvx4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "5252794e58eedb02d607fa3187ffead7becc81b0", "rev": "c77e8379d8fe01213ba072e40946cbfb7b58e628",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,22 +142,6 @@
"type": "github" "type": "github"
} }
}, },
"ghc-utils": {
"flake": false,
"locked": {
"lastModified": 1662774800,
"narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=",
"ref": "refs/heads/master",
"rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea",
"revCount": 1072,
"type": "git",
"url": "https://gitlab.haskell.org/bgamari/ghc-utils"
},
"original": {
"type": "git",
"url": "https://gitlab.haskell.org/bgamari/ghc-utils"
}
},
"helix": { "helix": {
"inputs": { "inputs": {
"nci": "nci", "nci": "nci",
@ -184,11 +151,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1668522840, "lastModified": 1669912658,
"narHash": "sha256-lM2yg9+wDwBupmtgkARd3yx3Q6viDdbPIeTstL+CyFs=", "narHash": "sha256-U2nF7FyRFD59zHfy+3IaiPmFu7MdgyA5TYDBbUikoA4=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "df6d04425d130f385c4314ed944d5a27963ae9a3", "rev": "a8a54be6bcd0667c50b7c739dbfd072df684b3c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,23 +164,24 @@
"type": "github" "type": "github"
} }
}, },
"home-manager-2205": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixos-2205" "nixpkgs"
] ],
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1667907331, "lastModified": 1669724862,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", "narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5", "rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.05", "ref": "release-22.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -232,11 +200,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667542401, "lastModified": 1669011203,
"narHash": "sha256-mdWjP5tjSf8n6FAtpSgL23kX4+eWBwLrSYo9iY3mA8Q=", "narHash": "sha256-Lymj4HktNEFmVXtwI0Os7srDXHZbZW0Nzw3/+5Hf8ko=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "cd5e5cbd81c80dc219455dd3b1e0ddb55fae51ec", "rev": "c5133b91fc1d549087c91228bd213f2518728a4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -249,7 +217,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixos-2205" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -266,29 +234,29 @@
"type": "github" "type": "github"
} }
}, },
"nixos-2205": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1668459637, "lastModified": 1669834992,
"narHash": "sha256-HqnWCKujmtu8v0CjzOT0sr7m2AR7+vpbZJOp1R0rodY=", "narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "16f4e04658c2ab10114545af2f39db17d51bd1bd", "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
"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"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1668524723, "lastModified": 1669805596,
"narHash": "sha256-JIJ0MtvY23I/6aIsqi8CG67XWZ/34WtDcgFXxgSTvNU=", "narHash": "sha256-g1CPQZ+1jGhY4bsjppk+gH5jfzzqmPlqGHg0zSYS3Hw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "8e8775f99549ba721c11643dfe70f4161d5c2f0b", "rev": "c81b1e527f3a220abfa9bf8096153d52784c5007",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -301,9 +269,9 @@
"inputs": { "inputs": {
"dan": "dan", "dan": "dan",
"helix": "helix", "helix": "helix",
"home-manager-2205": "home-manager-2205", "home-manager": "home-manager",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixos-2205": "nixos-2205", "nixpkgs": "nixpkgs",
"nur": "nur", "nur": "nur",
"unstable": "unstable" "unstable": "unstable"
} }
@ -317,11 +285,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667487142, "lastModified": 1668998422,
"narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=", "narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b", "rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,11 +300,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1668475027, "lastModified": 1669867399,
"narHash": "sha256-1xDT1pAm+NpH6cnjoC4v+xWGoGimiWZnth2bX899RKA=", "narHash": "sha256-Z8RXSFYOsIsTG96ROKtV0eZ8Q7u4irFWm6ELqfw7mT8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "032b5c19b09e8bb9b80eba484b58d1b525dc609d", "rev": "38e591dd05ffc8bdf79dc752ba78b05e370416fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -345,6 +313,21 @@
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
},
"utils": {
"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"
}
} }
}, },
"root": "root", "root": "root",

26
flake.nix
View File

@ -5,14 +5,14 @@
nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc="; nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
inputs = { inputs = {
home-manager-2205.url = "github:nix-community/home-manager/release-22.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
nixos-2205.url = "github:nixos/nixpkgs/nixos-22.05";
home-manager-2205.inputs.nixpkgs.follows = "nixos-2205"; home-manager.url = "github:nix-community/home-manager/release-22.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
nur.inputs.nixpkgs.follows = "unstable";
dan.url = "git+https://git2.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR"; dan.url = "git+https://git2.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR";
dan.inputs.nixpkgs.follows = "unstable"; dan.inputs.nixpkgs.follows = "unstable";
@ -21,16 +21,15 @@
helix.inputs.nixpkgs.follows = "unstable"; helix.inputs.nixpkgs.follows = "unstable";
nixgl.url = "github:guibou/nixGL"; nixgl.url = "github:guibou/nixGL";
nixgl.inputs.nixpkgs.follows = "nixos-2205"; nixgl.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = {self, home-manager-2205, unstable, nur, dan, nixgl, ... }@inputs: outputs = {self, nixpkgs, home-manager, unstable, nur, dan, nixgl, ... }@inputs:
let let
nixlib = unstable.lib; nixlib = unstable.lib;
mkHome = mkHome =
{ machine { machine
, hmChannel ? home-manager-2205
, configuration ? self.nixosModules.home-manager.${machine} , configuration ? self.nixosModules.home-manager.${machine}
, system ? "x86_64-linux" , system ? "x86_64-linux"
, username ? "daniel" , username ? "daniel"
@ -38,8 +37,17 @@
, stateVersion ? "22.05" , stateVersion ? "22.05"
, extraSpecialArgs ? { inherit (self) overlays; } , extraSpecialArgs ? { inherit (self) overlays; }
}: }:
hmChannel.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {
inherit configuration system username homeDirectory stateVersion extraSpecialArgs; pkgs = nixpkgs.legacyPackages.${system};
modules = [
configuration
{
home = {
inherit username homeDirectory stateVersion;
};
}
];
inherit extraSpecialArgs;
}; };
mkHomes = machines: extraArgs: nixlib.genAttrs machines (machine: mkHome ({inherit machine; } // extraArgs)); mkHomes = machines: extraArgs: nixlib.genAttrs machines (machine: mkHome ({inherit machine; } // extraArgs));

2
machines/headless.nix
View File

@ -12,7 +12,5 @@
}; };
profiles.base.enable = true; profiles.base.enable = true;
profiles.base.enable = false;
profiles.zsh.enable = true; profiles.zsh.enable = true;
} }

2
profiles/games/default.nix
View File

@ -18,7 +18,7 @@ in {
] ++ lib.optionals config.profiles.gui.enable [ ] ++ lib.optionals config.profiles.gui.enable [
steam steam
unstable.polymc unstable.prismlauncher
# minetest # minetest
# dwarf-fortress-packages.dwarf-fortress-full # dwarf-fortress-packages.dwarf-fortress-full
# superTuxKart # superTuxKart

1
profiles/xsession/default.nix
View File

@ -97,7 +97,6 @@ in
services.picom = { services.picom = {
enable = true; enable = true;
backend = "xrender"; backend = "xrender";
experimentalBackends = true;
}; };