Compare commits

..

No commits in common. "e1601a0aefc337af7cdb3041614598ebfc91de48" and "56b1f8133e7de46e035ea3c2f00d5055b214de2e" have entirely different histories.

9 changed files with 38 additions and 51 deletions

View file

@ -209,11 +209,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736199437, "lastModified": 1734701201,
"narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=", "narHash": "sha256-hk0roBX10j/hospoWIJIJj3i2skd7Oml6yKQBx7mTFk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf", "rev": "2ee76c861af3b895b3b104bae04777b61397485b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +227,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1735940463, "lastModified": 1733974299,
"narHash": "sha256-qrjv3UrlcFQf8zFjV4lMDmcBnlow/sqyyjGFAXp8mLk=", "narHash": "sha256-fPvJ/ZsQGVqGJqYL2gKotalQUoG1wpUYTJkRKG2BrwA=",
"owner": "lelgenio", "owner": "lelgenio",
"repo": "dzgui-nix", "repo": "dzgui-nix",
"rev": "fccedf1386f484375570e0195c7a08d7687b1df6", "rev": "580022e73efedb17ddf640115539cb9bd1423d44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -440,11 +440,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735344290, "lastModified": 1734366194,
"narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "613691f285dad87694c2ba1c9e6298d04736292d", "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -481,11 +481,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736047960, "lastModified": 1734234111,
"narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "816a6ae88774ba7e74314830546c29e134e0dffb", "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -501,14 +501,16 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-24_11": "nixpkgs-24_11" "nixpkgs-24_05": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1735230346, "lastModified": 1734370678,
"narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=", "narHash": "sha256-a8zkti1QM5Oxkdfnzr/NjrFlyqI36/kYV/X8G1jOmB4=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b", "rev": "c43d8c4a3ce84a7bebd110b06e69365484db6208",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -534,28 +536,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-24_11": {
"locked": {
"lastModified": 1734083684,
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-24.11",
"type": "indirect"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1736012469, "lastModified": 1734424634,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -612,11 +599,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1736061677, "lastModified": 1734737257,
"narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -29,6 +29,7 @@
nixos-mailserver = { nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-24_05.follows = "nixpkgs";
}; };
dzgui-nix.url = "github:lelgenio/dzgui-nix"; dzgui-nix.url = "github:lelgenio/dzgui-nix";

View file

@ -13,6 +13,7 @@ in
{ {
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelParams = [ boot.kernelParams = [
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
"video=DP-1:1920x1080@144" "video=DP-1:1920x1080@144"
"amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting
]; ];
@ -21,10 +22,6 @@ in
script = '' script = ''
${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85 ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85
''; '';
serviceConfig = {
Restart = "always";
RestartSec = 10;
};
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
}; };
@ -32,6 +29,10 @@ in
hardware.graphics.extraPackages = with pkgs; [ hardware.graphics.extraPackages = with pkgs; [
libva libva
libvdpau
vaapiVdpau
rocmPackages.clr
rocmPackages.rocm-smi
]; ];
services.udev.extraRules = '' services.udev.extraRules = ''

View file

@ -41,6 +41,8 @@ in
package = pkgs.unstable.opentabletdriver; package = pkgs.unstable.opentabletdriver;
}; };
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];

View file

@ -10,11 +10,6 @@
extraSettingsFile = config.age.secrets.factorio-settings.path; extraSettingsFile = config.age.secrets.factorio-settings.path;
}; };
systemd.services.factorio = {
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
};
age.secrets.factorio-settings = { age.secrets.factorio-settings = {
file = ../../secrets/factorio-settings.age; file = ../../secrets/factorio-settings.age;
mode = "777"; mode = "777";

View file

@ -18,6 +18,6 @@
tdesktop tdesktop
discord-canary discord-canary
thunderbird thunderbird
element-desktop element-desktop-wayland
]; ];
} }

View file

@ -127,7 +127,7 @@ in
ranger ranger
bmenu bmenu
kak-lsp kak-lsp
kak-tree-sitter unstable.kak-tree-sitter
kak-pager kak-pager
kak-man-pager kak-man-pager

View file

@ -10,8 +10,8 @@
"Filters": [], "Filters": [],
"AbsoluteModeSettings": { "AbsoluteModeSettings": {
"Display": { "Display": {
"Width": 1920.0, "Width": 960.0,
"Height": 1080.0, "Height": 540.0,
"X": 960.0, "X": 960.0,
"Y": 540.0, "Y": 540.0,
"Rotation": 0.0 "Rotation": 0.0
@ -76,7 +76,7 @@
"Settings": [ "Settings": [
{ {
"Property": "Keys", "Property": "Keys",
"Value": "Control+Shift+Z" "Value": "Control+O"
} }
], ],
"Enable": true "Enable": true

View file

@ -58,6 +58,7 @@ in
{ app_id = "wdisplays"; } { app_id = "wdisplays"; }
{ app_id = "pavucontrol"; } { app_id = "pavucontrol"; }
{ app_id = ".*[Hh]elvum.*"; } { app_id = ".*[Hh]elvum.*"; }
{ workspace = "9"; }
]; ];
}; };
}; };