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

flake: updates to 24.05

This commit is contained in:
Mateusz Słodkowicz 2024-06-17 13:09:58 +02:00
parent 636eb2a8e6
commit 7d90f5f210
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
15 changed files with 126 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configurations/host/default.nix
View File

@ -52,10 +52,10 @@ let
}) // { inherit materusCfg; }; }) // { inherit materusCfg; };
in in
{ {
materusPC = makeSystem { host = "materusPC"; stable = false; }; materusPC = makeSystem { host = "materusPC"; stable = true; };
flamaster = makeSystem { host = "flamaster"; stable = true; }; flamaster = makeSystem { host = "flamaster"; stable = true; };
valkyrie = makeSystem { host = "valkyrie"; stable = true; }; valkyrie = makeSystem { host = "valkyrie"; stable = true; };
waffentrager = makeSystem { host = "waffentrager"; stable = true; arch = "aarch64-linux"; }; waffentrager = makeSystem { host = "waffentrager"; stable = true; arch = "aarch64-linux"; };
Old-materusPC = makeSystem { host = "Old-materusPC"; stable = false; }; Old-materusPC = makeSystem { host = "Old-materusPC"; stable = true; };
} }

2
configurations/host/flamaster/configuration.nix
View File

@ -108,7 +108,7 @@
}; };
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; services.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users.materus = { users.users.materus = {

2
configurations/host/flamaster/home/materus/default.nix
View File

@ -27,7 +27,7 @@
gcc gcc
gdb gdb
nil nil
nixfmt nixfmt-classic
nixpkgs-fmt nixpkgs-fmt
cmake cmake
gnumake gnumake

2
configurations/host/materusPC/home/materus/default.nix
View File

@ -31,7 +31,7 @@
gcc gcc
gdb gdb
nil nil
nixfmt nixfmt-classic
nixpkgs-fmt nixpkgs-fmt
cmake cmake
gnumake gnumake

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

@ -56,9 +56,9 @@
services.printing.enable = true; services.printing.enable = true;
config.nix.package = pkgs.nixVersions.latest;
services.libinput.enable = true;
services.xserver.libinput.enable = true;
virtualisation.waydroid.enable = false; virtualisation.waydroid.enable = false;
virtualisation.podman = { virtualisation.podman = {

6
configurations/host/materusPC/vm/win10/default.nix
View File

@ -44,8 +44,10 @@ let
systemctl stop windows-share-mount.service systemctl stop windows-share-mount.service
# Make sure nothing renders on gpu to prevent "sysfs: cannot create duplicate filename" after rebinding to amdgpu # Make sure nothing renders on gpu to prevent "sysfs: cannot create duplicate filename" after rebinding to amdgpu
chmod 0 /dev/dri/renderD128 chmod 0 /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-render
fuser -k /dev/dri/renderD128 chmod 0 /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-card
fuser -k /dev/dri/by-path/pci-$VIRSH_GPU_VIDEO-render
pkill Xwayland
# Seems to fix reset bug for 7900 XTX # Seems to fix reset bug for 7900 XTX
echo "0" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/d3cold_allowed" echo "0" > "/sys/bus/pci/devices/''${VIRSH_GPU_VIDEO}/d3cold_allowed"

2
configurations/host/valkyrie/default.nix
View File

@ -64,7 +64,7 @@
# hardware.pulseaudio.enable = true; # hardware.pulseaudio.enable = true;
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; services.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users.materus = { users.users.materus = {

BIN
configurations/host/valkyrie/secrets/private/default.nix
View File

Binary file not shown.

2
configurations/host/waffentrager/configuration.nix
View File

@ -100,7 +100,7 @@
# hardware.pulseaudio.enable = true; # hardware.pulseaudio.enable = true;
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; services.libinput.enable = true;
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
# users.users.alice = { # users.users.alice = {

BIN
configurations/host/waffentrager/secrets/private/default.nix
View File

Binary file not shown.

2
configurations/profile/common/nixpkgs.nix
View File

@ -20,7 +20,7 @@ in
}; };
config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [ materusArg.cfg.configInputs.emacs-overlay.overlay ]; config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [ materusArg.cfg.configInputs.emacs-overlay.overlay ];
config.nix.package = lib.mkDefault (if (!materusCfg.stable) then pkgs.nixVersions.${"latest"} else pkgs.nixVersions.stable); config.nix.package = lib.mkDefault pkgs.nixVersions.latest;
config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry { config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry {
nixpkgs-stable = { nixpkgs-stable = {
from = { type = "indirect"; id = "nixpkgs-stable"; }; from = { type = "indirect"; id = "nixpkgs-stable"; };

2
configurations/profile/common/packages/default.nix
View File

@ -19,7 +19,7 @@ with materusArg.pkgs.lib;
nix-prefetch-scripts nix-prefetch-scripts
nix-prefetch-github nix-prefetch-github
nix-prefetch-docker nix-prefetch-docker
nixfmt nixfmt-classic
nix-top nix-top
nix-tree nix-tree
nix-diff nix-diff

4
configurations/profile/home/shell/zsh.nix
View File

@ -71,8 +71,8 @@ in
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableAutosuggestions = true; autosuggestion.enable = true;
enableSyntaxHighlighting = true; syntaxHighlighting.enable = true;
enableVteIntegration = true; enableVteIntegration = true;
historySubstringSearch.enable = true; historySubstringSearch.enable = true;
historySubstringSearch.searchUpKey = "$key[Up]"; historySubstringSearch.searchUpKey = "$key[Up]";

214
flake.lock
View File

@ -167,11 +167,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1718390211, "lastModified": 1718615420,
"narHash": "sha256-UvqJfD3SHtj3xG9Dc2DVaTlZofkyBJ2wk5WL35iWTgY=", "narHash": "sha256-hW9fRiFp/sMlX9PXj5az9tozcq5CYAYhWDWXrrnrmM4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "9be87fae5515892871716818dbdc303d76bb8540", "rev": "292ec2022a1d758d0a91232e524eab5e4a36a219",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +194,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1718390211, "lastModified": 1718615420,
"narHash": "sha256-UvqJfD3SHtj3xG9Dc2DVaTlZofkyBJ2wk5WL35iWTgY=", "narHash": "sha256-hW9fRiFp/sMlX9PXj5az9tozcq5CYAYhWDWXrrnrmM4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "9be87fae5515892871716818dbdc303d76bb8540", "rev": "292ec2022a1d758d0a91232e524eab5e4a36a219",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -337,16 +337,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717476296, "lastModified": 1718530513,
"narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", "rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -359,11 +359,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718243258, "lastModified": 1718526747,
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,10 +378,10 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1714515075, "lastModified": 1716736833,
"narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"path": "/nix/store/iybmik4n9y7n3n32asrsad8b02x9awmd-source", "path": "/nix/store/69xnjv9zg8a0gsyhsn8lp8937wy0a392-source",
"rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -445,11 +445,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1718349360, "lastModified": 1718548414,
"narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -461,11 +461,11 @@
}, },
"nixos-hardware_2": { "nixos-hardware_2": {
"locked": { "locked": {
"lastModified": 1718349360, "lastModified": 1718548414,
"narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", "narHash": "sha256-1obyIuQPR/Kq1j5/i/5EuAfQrDwjYnjCDG8iLtXmBhQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", "rev": "cde8f7e11f036160b0fd6a9e07dc4c8e4061cf06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -477,85 +477,21 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714076141, "lastModified": 1716542732,
"narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": {
"lastModified": 1718060059,
"narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a3c8d64ba846725f040582b2d3b875466d2115bd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1717880976,
"narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1718060059,
"narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a3c8d64ba846725f040582b2d3b875466d2115bd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1717880976,
"narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_5": {
"locked": { "locked": {
"lastModified": 1718229064, "lastModified": 1718229064,
"narHash": "sha256-ZFav8A9zPNfjZg/wrxh1uZeMJHELRfRgFP+meq01XYk=", "narHash": "sha256-ZFav8A9zPNfjZg/wrxh1uZeMJHELRfRgFP+meq01XYk=",
@ -571,6 +507,70 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1718478900,
"narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c884223af91820615a6146af1ae1fea25c107005",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1718229064,
"narHash": "sha256-ZFav8A9zPNfjZg/wrxh1uZeMJHELRfRgFP+meq01XYk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c2ec3a5c2ee9909904f860dadc19bc12cd9cc44",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1718478900,
"narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c884223af91820615a6146af1ae1fea25c107005",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_5": {
"locked": {
"lastModified": 1718437845,
"narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1718318537, "lastModified": 1718318537,
@ -602,11 +602,11 @@
}, },
"nur_2": { "nur_2": {
"locked": { "locked": {
"lastModified": 1718391791, "lastModified": 1718621143,
"narHash": "sha256-l7Ow+MXGqSYr7WliALyRw+5hOH/kSsuC5qswAXU/PP4=", "narHash": "sha256-TeU1Yun2IocjJiOgpanrgfb9CqZz6DuN6SykOZkxf0Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e2eac9df491c35b114641a3f4d66210953a623c3", "rev": "ef9adc6e4f937a4a010867c5625ec14508338083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -631,11 +631,11 @@
}, },
"nur_4": { "nur_4": {
"locked": { "locked": {
"lastModified": 1718391791, "lastModified": 1718621143,
"narHash": "sha256-l7Ow+MXGqSYr7WliALyRw+5hOH/kSsuC5qswAXU/PP4=", "narHash": "sha256-TeU1Yun2IocjJiOgpanrgfb9CqZz6DuN6SykOZkxf0Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e2eac9df491c35b114641a3f4d66210953a623c3", "rev": "ef9adc6e4f937a4a010867c5625ec14508338083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -647,10 +647,10 @@
}, },
"nur_5": { "nur_5": {
"locked": { "locked": {
"lastModified": 1714665582, "lastModified": 1717231546,
"narHash": "sha256-4AvWvlif/vjZeUc5oldA1VlLSwZn5GzJYbrW3yt7YH4=", "narHash": "sha256-qFMtR4NJZPgjAs7HXo7JbXrekQrX9QLNW506YKlz9Xs=",
"path": "/nix/store/6nxjh945516m460kidrnjnmlbm6s1rgx-source", "path": "/nix/store/53aq869sffxlrdibzg15csnm73nd9s3x-source",
"rev": "7182bb77cdf51e1d559a9fe04a204fa96e43ff12", "rev": "0a7d504ca4d14687d8fbdc07a19efba2a58b87f7",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -695,11 +695,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1718137936, "lastModified": 1718506969,
"narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -718,11 +718,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1718137936, "lastModified": 1718506969,
"narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@ -29,14 +29,14 @@
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "nixos-23.11"; ref = "nixos-24.05";
}; };
hm-stable = { hm-stable = {
type = "github"; type = "github";
owner = "nix-community"; owner = "nix-community";
repo = "home-manager"; repo = "home-manager";
ref = "release-23.11"; ref = "release-24.05";
inputs.nixpkgs.follows = "nixpkgs-stable"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };