diff --git a/flake.lock b/flake.lock index b2c2019..e166853 100644 --- a/flake.lock +++ b/flake.lock @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1736199437, - "narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=", + "lastModified": 1734701201, + "narHash": "sha256-hk0roBX10j/hospoWIJIJj3i2skd7Oml6yKQBx7mTFk=", "owner": "nix-community", "repo": "disko", - "rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf", + "rev": "2ee76c861af3b895b3b104bae04777b61397485b", "type": "github" }, "original": { @@ -227,11 +227,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1735940463, - "narHash": "sha256-qrjv3UrlcFQf8zFjV4lMDmcBnlow/sqyyjGFAXp8mLk=", + "lastModified": 1733974299, + "narHash": "sha256-fPvJ/ZsQGVqGJqYL2gKotalQUoG1wpUYTJkRKG2BrwA=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "fccedf1386f484375570e0195c7a08d7687b1df6", + "rev": "580022e73efedb17ddf640115539cb9bd1423d44", "type": "github" }, "original": { @@ -440,11 +440,11 @@ ] }, "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "owner": "nix-community", "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1736047960, - "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", + "lastModified": 1734234111, + "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", + "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", "type": "github" }, "original": { @@ -501,14 +501,16 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_11": "nixpkgs-24_11" + "nixpkgs-24_05": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1735230346, - "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=", + "lastModified": 1734370678, + "narHash": "sha256-a8zkti1QM5Oxkdfnzr/NjrFlyqI36/kYV/X8G1jOmB4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b", + "rev": "c43d8c4a3ce84a7bebd110b06e69365484db6208", "type": "gitlab" }, "original": { @@ -534,28 +536,13 @@ "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": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -612,11 +599,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736061677, - "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", + "lastModified": 1734737257, + "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", + "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1e11ec6..c580335 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,7 @@ nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-24_05.follows = "nixpkgs"; }; dzgui-nix.url = "github:lelgenio/dzgui-nix"; diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 4c26afa..0df9923 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -13,6 +13,7 @@ in { boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelParams = [ + "amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug "video=DP-1:1920x1080@144" "amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting ]; @@ -21,10 +22,6 @@ in script = '' ${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85 ''; - serviceConfig = { - Restart = "always"; - RestartSec = 10; - }; wantedBy = [ "multi-user.target" ]; }; @@ -32,6 +29,10 @@ in hardware.graphics.extraPackages = with pkgs; [ libva + libvdpau + vaapiVdpau + rocmPackages.clr + rocmPackages.rocm-smi ]; services.udev.extraRules = '' diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index c3764fd..77dfa50 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -41,6 +41,8 @@ in package = pkgs.unstable.opentabletdriver; }; + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.initrd.kernelModules = [ "amdgpu" ]; diff --git a/hosts/monolith/factorio-server.nix b/hosts/monolith/factorio-server.nix index 211e746..3c893a5 100644 --- a/hosts/monolith/factorio-server.nix +++ b/hosts/monolith/factorio-server.nix @@ -10,11 +10,6 @@ extraSettingsFile = config.age.secrets.factorio-settings.path; }; - systemd.services.factorio = { - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; - }; - age.secrets.factorio-settings = { file = ../../secrets/factorio-settings.age; mode = "777"; diff --git a/user/chat.nix b/user/chat.nix index b42f6fd..fda61e3 100644 --- a/user/chat.nix +++ b/user/chat.nix @@ -18,6 +18,6 @@ tdesktop discord-canary thunderbird - element-desktop + element-desktop-wayland ]; } diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index a015bd0..9963f26 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -127,7 +127,7 @@ in ranger bmenu kak-lsp - kak-tree-sitter + unstable.kak-tree-sitter kak-pager kak-man-pager diff --git a/user/sway/open-tablet-driver.json b/user/sway/open-tablet-driver.json index bf49af6..632cd6c 100644 --- a/user/sway/open-tablet-driver.json +++ b/user/sway/open-tablet-driver.json @@ -10,8 +10,8 @@ "Filters": [], "AbsoluteModeSettings": { "Display": { - "Width": 1920.0, - "Height": 1080.0, + "Width": 960.0, + "Height": 540.0, "X": 960.0, "Y": 540.0, "Rotation": 0.0 @@ -76,7 +76,7 @@ "Settings": [ { "Property": "Keys", - "Value": "Control+Shift+Z" + "Value": "Control+O" } ], "Enable": true diff --git a/user/sway/sway-assigns.nix b/user/sway/sway-assigns.nix index 8f073c7..65e1a97 100644 --- a/user/sway/sway-assigns.nix +++ b/user/sway/sway-assigns.nix @@ -58,6 +58,7 @@ in { app_id = "wdisplays"; } { app_id = "pavucontrol"; } { app_id = ".*[Hh]elvum.*"; } + { workspace = "9"; } ]; }; };