Compare commits
8 commits
56b1f8133e
...
e1601a0aef
Author | SHA1 | Date | |
---|---|---|---|
e1601a0aef | |||
8012d3835d | |||
cf2cc34311 | |||
eda788a912 | |||
26e013d88f | |||
d84480a40d | |||
f98e1ef0b7 | |||
5ff7906392 |
63
flake.lock
63
flake.lock
|
@ -209,11 +209,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734701201,
|
"lastModified": 1736199437,
|
||||||
"narHash": "sha256-hk0roBX10j/hospoWIJIJj3i2skd7Oml6yKQBx7mTFk=",
|
"narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "2ee76c861af3b895b3b104bae04777b61397485b",
|
"rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -227,11 +227,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733974299,
|
"lastModified": 1735940463,
|
||||||
"narHash": "sha256-fPvJ/ZsQGVqGJqYL2gKotalQUoG1wpUYTJkRKG2BrwA=",
|
"narHash": "sha256-qrjv3UrlcFQf8zFjV4lMDmcBnlow/sqyyjGFAXp8mLk=",
|
||||||
"owner": "lelgenio",
|
"owner": "lelgenio",
|
||||||
"repo": "dzgui-nix",
|
"repo": "dzgui-nix",
|
||||||
"rev": "580022e73efedb17ddf640115539cb9bd1423d44",
|
"rev": "fccedf1386f484375570e0195c7a08d7687b1df6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -440,11 +440,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734366194,
|
"lastModified": 1735344290,
|
||||||
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
|
"narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
|
"rev": "613691f285dad87694c2ba1c9e6298d04736292d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -481,11 +481,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734234111,
|
"lastModified": 1736047960,
|
||||||
"narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=",
|
"narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d",
|
"rev": "816a6ae88774ba7e74314830546c29e134e0dffb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -501,16 +501,14 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nixpkgs-24_05": [
|
"nixpkgs-24_11": "nixpkgs-24_11"
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734370678,
|
"lastModified": 1735230346,
|
||||||
"narHash": "sha256-a8zkti1QM5Oxkdfnzr/NjrFlyqI36/kYV/X8G1jOmB4=",
|
"narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=",
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"rev": "c43d8c4a3ce84a7bebd110b06e69365484db6208",
|
"rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -536,13 +534,28 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-24_11": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734424634,
|
"lastModified": 1734083684,
|
||||||
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
|
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
|
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"ref": "nixos-24.11",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1736012469,
|
||||||
|
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -599,11 +612,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734737257,
|
"lastModified": 1736061677,
|
||||||
"narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=",
|
"narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1c6e20d41d6a9c1d737945962160e8571df55daa",
|
"rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
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";
|
||||||
|
|
|
@ -13,7 +13,6 @@ 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
|
||||||
];
|
];
|
||||||
|
@ -22,6 +21,10 @@ 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" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -29,10 +32,6 @@ 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 = ''
|
||||||
|
|
|
@ -41,8 +41,6 @@ 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" ];
|
||||||
|
|
|
@ -10,6 +10,11 @@
|
||||||
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";
|
||||||
|
|
|
@ -18,6 +18,6 @@
|
||||||
tdesktop
|
tdesktop
|
||||||
discord-canary
|
discord-canary
|
||||||
thunderbird
|
thunderbird
|
||||||
element-desktop-wayland
|
element-desktop
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -127,7 +127,7 @@ in
|
||||||
ranger
|
ranger
|
||||||
bmenu
|
bmenu
|
||||||
kak-lsp
|
kak-lsp
|
||||||
unstable.kak-tree-sitter
|
kak-tree-sitter
|
||||||
kak-pager
|
kak-pager
|
||||||
kak-man-pager
|
kak-man-pager
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
"Filters": [],
|
"Filters": [],
|
||||||
"AbsoluteModeSettings": {
|
"AbsoluteModeSettings": {
|
||||||
"Display": {
|
"Display": {
|
||||||
"Width": 960.0,
|
"Width": 1920.0,
|
||||||
"Height": 540.0,
|
"Height": 1080.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+O"
|
"Value": "Control+Shift+Z"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"Enable": true
|
"Enable": true
|
||||||
|
|
|
@ -58,7 +58,6 @@ in
|
||||||
{ app_id = "wdisplays"; }
|
{ app_id = "wdisplays"; }
|
||||||
{ app_id = "pavucontrol"; }
|
{ app_id = "pavucontrol"; }
|
||||||
{ app_id = ".*[Hh]elvum.*"; }
|
{ app_id = ".*[Hh]elvum.*"; }
|
||||||
{ workspace = "9"; }
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue