materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flake: update, config: code cleaning

This commit is contained in:
Mateusz Słodkowicz 2024-02-25 18:25:39 +01:00
parent 011ceddcb5
commit f0d5df9cca
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
3 changed files with 241 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configurations/host/materusPC/tmp.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, materusArg, ... }: { config, pkgs, materusArg, ... }:
{ {
virtualisation.lxc.enable = true; virtualisation.lxc.enable = true;
@ -125,7 +125,7 @@
environment.variables = { environment.variables = {
ALSOFT_DRIVERS = "pulse"; ALSOFT_DRIVERS = "pulse";
}; };
environment.sessionVariables = rec { environment.sessionVariables = {
XDG_CACHE_HOME = "\${HOME}/.cache"; XDG_CACHE_HOME = "\${HOME}/.cache";
XDG_CONFIG_HOME = "\${HOME}/.config"; XDG_CONFIG_HOME = "\${HOME}/.config";
XDG_BIN_HOME = "\${HOME}/.local/bin"; XDG_BIN_HOME = "\${HOME}/.local/bin";
@ -212,7 +212,7 @@
gamescope gamescope
#(pkgs.lutris.override { extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; }) #(pkgs.lutris.override { extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
materusArg.pkgs.amdgpu-pro-libs.prefixes materusArg.pkgs.amdgpu-pro-libs.prefixes
(pkgs.bottles.override { extraPkgs = pkgs: with pkgs; [ pkgs.libsForQt5.breeze-qt5 pkgs.libsForQt5.breeze-gtk pkgs.nss_latest ]; extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; }) (pkgs.bottles.override { extraPkgs = pkgs: [ pkgs.libsForQt5.breeze-qt5 pkgs.libsForQt5.breeze-gtk pkgs.nss_latest ]; extraLibraries = pkgs: [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
glibc glibc
glib glib
gtk3 gtk3

2
configurations/host/materusPC/vm/default.nix
View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
./win10 ./win10

284
flake.lock
View File

@ -1,8 +1,50 @@
{ {
"nodes": { "nodes": {
"base16": {
"inputs": {
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1705180696,
"narHash": "sha256-6TwTHERD+2SX21zvBwmm58mtmgVXHLPu273i04JdH9Y=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "b390e87cd404e65ab4d786666351f1292e89162a",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"ref": "main",
"repo": "base16.nix",
"type": "github"
}
},
"base16_2": {
"inputs": {
"fromYaml": "fromYaml_2"
},
"locked": {
"lastModified": 1705180696,
"narHash": "sha256-6TwTHERD+2SX21zvBwmm58mtmgVXHLPu273i04JdH9Y=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "b390e87cd404e65ab4d786666351f1292e89162a",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"ref": "main",
"repo": "base16.nix",
"type": "github"
}
},
"configInputs": { "configInputs": {
"inputs": { "inputs": {
"base16": "base16",
"devshell": "devshell",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"flake-utils": "flake-utils",
"git-agecrypt": "git-agecrypt",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixerus": "nixerus", "nixerus": "nixerus",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
@ -13,11 +55,11 @@
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
}, },
"locked": { "locked": {
"lastModified": 1708647798, "lastModified": 1708880949,
"narHash": "sha256-SNzkvWc99rFZZP9ppG5pxWujWGxqSfs0zemknVN2ojU=", "narHash": "sha256-P0NyxZ4iWaMYthXescmu6B3LPm4UlBqjmmnupffsmm8=",
"owner": "materusPL", "owner": "materusPL",
"repo": "nixos-config", "repo": "nixos-config",
"rev": "748756208fd3c65d044427e6ea5031f3605423ba", "rev": "361ed098b4a3f84c057a426827a37ee872224869",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -29,7 +71,11 @@
}, },
"configInputs-stable": { "configInputs-stable": {
"inputs": { "inputs": {
"base16": "base16_2",
"devshell": "devshell_2",
"emacs-overlay": "emacs-overlay_2", "emacs-overlay": "emacs-overlay_2",
"flake-utils": "flake-utils_2",
"git-agecrypt": "git-agecrypt_2",
"home-manager": [ "home-manager": [
"hm-stable" "hm-stable"
], ],
@ -42,11 +88,11 @@
"sops-nix": "sops-nix_2" "sops-nix": "sops-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1708647798, "lastModified": 1708880949,
"narHash": "sha256-SNzkvWc99rFZZP9ppG5pxWujWGxqSfs0zemknVN2ojU=", "narHash": "sha256-P0NyxZ4iWaMYthXescmu6B3LPm4UlBqjmmnupffsmm8=",
"owner": "materusPL", "owner": "materusPL",
"repo": "nixos-config", "repo": "nixos-config",
"rev": "748756208fd3c65d044427e6ea5031f3605423ba", "rev": "361ed098b4a3f84c057a426827a37ee872224869",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,9 +102,64 @@
"type": "github" "type": "github"
} }
}, },
"devshell": {
"inputs": {
"flake-utils": [
"configInputs",
"flake-utils"
],
"nixpkgs": [
"configInputs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1705332421,
"narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=",
"owner": "numtide",
"repo": "devshell",
"rev": "83cb93d6d063ad290beee669f4badf9914cc16ec",
"type": "github"
},
"original": {
"owner": "numtide",
"ref": "main",
"repo": "devshell",
"type": "github"
}
},
"devshell_2": {
"inputs": {
"flake-utils": [
"configInputs-stable",
"flake-utils"
],
"nixpkgs": [
"configInputs-stable",
"nixpkgs"
]
},
"locked": {
"lastModified": 1705332421,
"narHash": "sha256-USpGLPme1IuqG78JNqSaRabilwkCyHmVWY0M9vYyqEA=",
"owner": "numtide",
"repo": "devshell",
"rev": "83cb93d6d063ad290beee669f4badf9914cc16ec",
"type": "github"
},
"original": {
"owner": "numtide",
"ref": "main",
"repo": "devshell",
"type": "github"
}
},
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": [
"configInputs",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"configInputs", "configInputs",
"nixpkgs" "nixpkgs"
@ -66,11 +167,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1708621627, "lastModified": 1708879861,
"narHash": "sha256-6S/2dVnZRlygqajnhYZkrDM/WC/aSjO9/u8Ly+p0kNI=", "narHash": "sha256-Uw6YY4HHkjoDb+1PihpCYgTuKSTimo9vgXLdhOg+sEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "ab98cf0c6ddaf60cb1ef95e4e983695c7e8245e7", "rev": "8bd96b59c634cb8fd2cf7528a81be84d0779b0df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,7 +183,10 @@
}, },
"emacs-overlay_2": { "emacs-overlay_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": [
"configInputs-stable",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"configInputs-stable", "configInputs-stable",
"nixpkgs" "nixpkgs"
@ -90,11 +194,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1708621627, "lastModified": 1708879861,
"narHash": "sha256-6S/2dVnZRlygqajnhYZkrDM/WC/aSjO9/u8Ly+p0kNI=", "narHash": "sha256-Uw6YY4HHkjoDb+1PihpCYgTuKSTimo9vgXLdhOg+sEY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "ab98cf0c6ddaf60cb1ef95e4e983695c7e8245e7", "rev": "8bd96b59c634cb8fd2cf7528a81be84d0779b0df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,6 +222,7 @@
}, },
"original": { "original": {
"owner": "numtide", "owner": "numtide",
"ref": "main",
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
@ -136,10 +241,95 @@
}, },
"original": { "original": {
"owner": "numtide", "owner": "numtide",
"ref": "main",
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
}, },
"fromYaml": {
"flake": false,
"locked": {
"lastModified": 1689549921,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
"owner": "SenchoPens",
"repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "fromYaml",
"type": "github"
}
},
"fromYaml_2": {
"flake": false,
"locked": {
"lastModified": 1689549921,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
"owner": "SenchoPens",
"repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "fromYaml",
"type": "github"
}
},
"git-agecrypt": {
"inputs": {
"flake-utils": [
"configInputs",
"flake-utils"
],
"nixpkgs": [
"configInputs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1689346019,
"narHash": "sha256-6FjyJRYGyZt+uvYjXWvXI7DGq/+BNZHSSAT/DhOsF/E=",
"owner": "vlaci",
"repo": "git-agecrypt",
"rev": "945b80556d8848f6e85a8cc0053f9020bdc8b359",
"type": "github"
},
"original": {
"owner": "vlaci",
"ref": "main",
"repo": "git-agecrypt",
"type": "github"
}
},
"git-agecrypt_2": {
"inputs": {
"flake-utils": [
"configInputs-stable",
"flake-utils"
],
"nixpkgs": [
"configInputs-stable",
"nixpkgs"
]
},
"locked": {
"lastModified": 1689346019,
"narHash": "sha256-6FjyJRYGyZt+uvYjXWvXI7DGq/+BNZHSSAT/DhOsF/E=",
"owner": "vlaci",
"repo": "git-agecrypt",
"rev": "945b80556d8848f6e85a8cc0053f9020bdc8b359",
"type": "github"
},
"original": {
"owner": "vlaci",
"ref": "main",
"repo": "git-agecrypt",
"type": "github"
}
},
"hm-stable": { "hm-stable": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -169,11 +359,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708591310, "lastModified": 1708806879,
"narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=", "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55", "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,11 +403,11 @@
"nur": "nur" "nur": "nur"
}, },
"locked": { "locked": {
"lastModified": 1707924512, "lastModified": 1708804686,
"narHash": "sha256-VcfwzdiJ6qG6KMRU4z0IB7/X9tTNuh7Y4wU4BaakMqw=", "narHash": "sha256-WPn7vJ0fp3oQab0YoMfrkkV2gXAzq81hkBZaVFK4YtM=",
"owner": "materusPL", "owner": "materusPL",
"repo": "Nixerus", "repo": "Nixerus",
"rev": "9e38ba26c73801f68fa46379f157ab8e71c2b631", "rev": "d6f0de8b5207b15921c9423db8b45029e20140cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -240,11 +430,11 @@
"nur": "nur_3" "nur": "nur_3"
}, },
"locked": { "locked": {
"lastModified": 1707924512, "lastModified": 1708804686,
"narHash": "sha256-VcfwzdiJ6qG6KMRU4z0IB7/X9tTNuh7Y4wU4BaakMqw=", "narHash": "sha256-WPn7vJ0fp3oQab0YoMfrkkV2gXAzq81hkBZaVFK4YtM=",
"owner": "materusPL", "owner": "materusPL",
"repo": "Nixerus", "repo": "Nixerus",
"rev": "9e38ba26c73801f68fa46379f157ab8e71c2b631", "rev": "d6f0de8b5207b15921c9423db8b45029e20140cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -304,11 +494,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1708440434, "lastModified": 1708702655,
"narHash": "sha256-XY+B9mbhL/i+Q6fP6gBQ6P76rv9rWtpjQiUJ+DGtaUg=", "narHash": "sha256-qxT5jSLhelfLhQ07+AUxSTm1VnVH+hQxDkQSZ/m/Smo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "526d051b128b82ae045a70e5ff1adf8e6dafa560", "rev": "c5101e457206dd437330d283d6626944e28794b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -320,11 +510,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1708210246, "lastModified": 1708819810,
"narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=", "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49", "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +526,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1708440434, "lastModified": 1708702655,
"narHash": "sha256-XY+B9mbhL/i+Q6fP6gBQ6P76rv9rWtpjQiUJ+DGtaUg=", "narHash": "sha256-qxT5jSLhelfLhQ07+AUxSTm1VnVH+hQxDkQSZ/m/Smo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "526d051b128b82ae045a70e5ff1adf8e6dafa560", "rev": "c5101e457206dd437330d283d6626944e28794b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -352,11 +542,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1708210246, "lastModified": 1708819810,
"narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=", "narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49", "rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +604,11 @@
}, },
"nur_2": { "nur_2": {
"locked": { "locked": {
"lastModified": 1708640132, "lastModified": 1708864816,
"narHash": "sha256-w1h/s7LwjqYLUyspIuKankX6qHHeNWVhm3Oe+cvPIS8=", "narHash": "sha256-SM1zlHhoZf20lhp0v7ss52MYEWux/j+jfqfxUp8yqW8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e7d3179956f6054b12efb01f3a998474b48007df", "rev": "1fe352ab8a7560c8bbd793852c52979894a7705e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -444,11 +634,11 @@
}, },
"nur_4": { "nur_4": {
"locked": { "locked": {
"lastModified": 1708640132, "lastModified": 1708864816,
"narHash": "sha256-w1h/s7LwjqYLUyspIuKankX6qHHeNWVhm3Oe+cvPIS8=", "narHash": "sha256-SM1zlHhoZf20lhp0v7ss52MYEWux/j+jfqfxUp8yqW8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e7d3179956f6054b12efb01f3a998474b48007df", "rev": "1fe352ab8a7560c8bbd793852c52979894a7705e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -509,11 +699,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1708500294, "lastModified": 1708830076,
"narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=", "narHash": "sha256-Cjh2xdjxC6S6nW6Whr2dxSeh8vjodzhTmQdI4zPJ4RA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11", "rev": "2874fbbe4a65bd2484b0ad757d27a16107f6bc17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -532,11 +722,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1708500294, "lastModified": 1708830076,
"narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=", "narHash": "sha256-Cjh2xdjxC6S6nW6Whr2dxSeh8vjodzhTmQdI4zPJ4RA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11", "rev": "2874fbbe4a65bd2484b0ad757d27a16107f6bc17",
"type": "github" "type": "github"
}, },
"original": { "original": {