mandlm/nixos-config
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: upgrade to NixOS 24.05

Browse Source
This commit is contained in:
mandlm 2024-06-02 12:06:14 +02:00
parent 43bb81b755
commit 109a773f2a
Signed by: mandlm
GPG Key ID: 4AA25D647AA54CC7
6 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.nix
View File

@ -151,7 +151,7 @@
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
}; };
nix = { nix = {

28
flake.lock
View File

@ -7,27 +7,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716729592, "lastModified": 1716736833,
"narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"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"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1705260447, "lastModified": 1717321100,
"narHash": "sha256-30r/CoUwWBtTWtJX2tri4KsvR0OGwFJsNIk5bEWz0kE=", "narHash": "sha256-KGHHKh6seidZz6TzeTcD8K8elpruaBUKS6vkjhExIw4=",
"owner": "mandlm", "owner": "mandlm",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "02353c59409f60477ff4d566dfcfc9e9aef840fb", "rev": "f06c266ab87393a08b79f861fcfa57c264510861",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,27 +39,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716633019, "lastModified": 1717144377,
"narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1716769173, "lastModified": 1716948383,
"narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@ -1,12 +1,12 @@
{ {
inputs = { inputs = {
nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11; nixpkgs.url = github:NixOS/nixpkgs/nixos-24.05;
nixpkgs-unstable.url = github:NixOS/nixpkgs/nixos-unstable; nixpkgs-unstable.url = github:NixOS/nixpkgs/nixos-unstable;
nixos-hardware.url = github:mandlm/nixos-hardware/p330; nixos-hardware.url = github:mandlm/nixos-hardware/p330;
home-manager = { home-manager = {
url = github:nix-community/home-manager/release-23.11; url = github:nix-community/home-manager/release-24.05;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

4
home-manager/gpg/default.nix
View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, user, ... }: { pkgs, ... }:
{ {
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
pinentryFlavor = "gnome3"; pinentryPackage = pkgs.pinentry-gnome3;
enableSshSupport = true; enableSshSupport = true;
sshKeys = [ "1F937AC8F77ED74CE24EAAE79B5601F73C6D115F" ]; sshKeys = [ "1F937AC8F77ED74CE24EAAE79B5601F73C6D115F" ];
}; };

2
machines/xps/hardware-configuration.nix
View File

@ -62,7 +62,5 @@
# networking.interfaces.enp0s13f0u1u4u4.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s13f0u1u4u4.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
services.tlp.enable = true; services.tlp.enable = true;
} }

17
machines/xps/home-mandlm.nix
View File

@ -1,11 +1,13 @@
{ config, lib, pkgs, user, ... }: { ... }:
{ {
services.kanshi = { services.kanshi = {
enable = true; enable = true;
profiles = { settings = [
undocked = { {
profile = {
name = "undocked";
outputs = [ outputs = [
{ {
criteria = "eDP-1"; criteria = "eDP-1";
@ -14,8 +16,10 @@
} }
]; ];
}; };
}
home_office = { {
profile = {
name = "home_office";
outputs = [ outputs = [
{ {
criteria = "Samsung Electric Company SMS24A450 H4MCA12738"; criteria = "Samsung Electric Company SMS24A450 H4MCA12738";
@ -52,6 +56,7 @@
exec swaymsg workspace 1, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"' exec swaymsg workspace 1, move workspace to output '"Samsung Electric Company SMS24A450 H4MCA12730"'
''; '';
}; };
}; }
];
}; };
} }