diff --git a/nix/base/common_hardware.nix b/nix/base/common_hardware.nix index d514dc0..3ab990b 100644 --- a/nix/base/common_hardware.nix +++ b/nix/base/common_hardware.nix @@ -25,6 +25,14 @@ # Enable CUPS to print documents. services.printing.enable = true; + services.printing.browsing = true; + services.printing.drivers = [ pkgs.hplip ]; + services.printing.startWhenNeeded = true; # optional + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; # Enable sound with pipewire. sound.enable = true; @@ -51,7 +59,7 @@ users.users.dashie = { isNormalUser = true; description = "dashie"; - extraGroups = [ "networkmanager" "wheel" "gamemode" "docker" ]; + extraGroups = [ "networkmanager" "wheel" "gamemode" "docker" "vboxusers" ]; packages = with pkgs; [ home-manager xdg-desktop-portal-gtk diff --git a/nix/flake.lock b/nix/flake.lock index 0ff08ba..2e24b48 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -3,15 +3,15 @@ "Hyprspace": { "inputs": { "hyprland": [ - "nixpkgs" + "hyprland" ] }, "locked": { - "lastModified": 1715376791, - "narHash": "sha256-QKecFhWAB7sagSE+FXztINDqYqLro2nYp94f+ZtE/f4=", + "lastModified": 1718642173, + "narHash": "sha256-iyj4D6c77uROAH9QdZjPd9SKnS/DuACMESqaEKnBgI8=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "8049b2794ca19d49320093426677d8c2911e7327", + "rev": "2f3edb68f47a8f5d99d10b322e9a85a285f53cc7", "type": "github" }, "original": { @@ -23,14 +23,15 @@ "anyrun": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1713259062, - "narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=", + "lastModified": 1717576207, + "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=", "owner": "Kirottu", "repo": "anyrun", - "rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39", + "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4", "type": "github" }, "original": { @@ -47,11 +48,11 @@ ] }, "locked": { - "lastModified": 1713979152, - "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=", + "lastModified": 1717025063, + "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", "owner": "ipetkov", "repo": "crane", - "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c", + "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", "type": "github" }, "original": { @@ -68,11 +69,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -251,7 +252,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1705309234, @@ -269,7 +270,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1705309234, @@ -287,7 +288,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1705309234, @@ -305,7 +306,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -323,7 +324,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1705309234, @@ -341,7 +342,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1705309234, @@ -359,7 +360,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1705309234, @@ -382,11 +383,11 @@ ] }, "locked": { - "lastModified": 1717052710, - "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", + "lastModified": 1719180626, + "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", + "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "type": "github" }, "original": { @@ -411,11 +412,11 @@ ] }, "locked": { - "lastModified": 1716576411, - "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", "type": "github" }, "original": { @@ -447,17 +448,18 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1716968065, - "narHash": "sha256-kuVKS98JUgJ71Z3sRUo+YnQgmX8xdXoZZbBPyIZMWYs=", + "lastModified": 1719164993, + "narHash": "sha256-FABhTnL6CBNrvsHVrEXWYoH+zrNfA4yPmgorQupUSZo=", "ref": "refs/heads/main", - "rev": "a60c7283e677ed81a466d1c0c864c8a05e192cac", - "revCount": 4750, + "rev": "8a68199a0ceb2894a5d9cc300961c38123ac0312", + "revCount": 4879, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -482,11 +484,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -496,6 +498,35 @@ } }, "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { "inputs": { "nixpkgs": [ "hyprland", @@ -507,16 +538,16 @@ ] }, "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", + "lastModified": 1718804078, + "narHash": "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", + "repo": "hyprutils", + "rev": "4f1351295c55a8f51219b25aa4a6497a067989d0", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprutils", "type": "github" } }, @@ -532,11 +563,11 @@ ] }, "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "lastModified": 1718119275, + "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "rev": "1419520d5f7f38d35e05504da5c1b38212a38525", "type": "github" }, "original": { @@ -553,11 +584,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1717013290, - "narHash": "sha256-ObYq1f7DaYaTEhujqg+nAOjoH2XgMRDrfe1dGjRofzM=", + "lastModified": 1718914518, + "narHash": "sha256-wjL7KiQFGRbf2CnCDi/VeSIr30ndOVt/PUpBauI+RAE=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "b5755ef9d495bdf623965562725a7c0b1d27ea04", + "rev": "a9d728f1911007afa1edf6aac2ca1148b4c22d6c", "type": "github" }, "original": { @@ -571,11 +602,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1713520724, - "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=", + "lastModified": 1717067539, + "narHash": "sha256-oIs5EF+6VpHJRvvpVWuqCYJMMVW/6h59aYUv9lABLtY=", "owner": "nix-community", "repo": "naersk", - "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49", + "rev": "fa19d8c135e776dc97f4dcca08656a0eeb28d5c0", "type": "github" }, "original": { @@ -601,11 +632,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -617,11 +648,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716655032, - "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", + "lastModified": 1719099622, + "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", + "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "type": "github" }, "original": { @@ -809,11 +840,11 @@ }, "nixpkgs_20": { "locked": { - "lastModified": 1716651315, - "narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", + "lastModified": 1718983919, + "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5187508b11177ef4278edf19616f44f21cc8c69", + "rev": "90338afd6177fc683a04d934199d693708c85a3b", "type": "github" }, "original": { @@ -825,11 +856,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { @@ -841,11 +872,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714314149, - "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", "type": "github" }, "original": { @@ -855,11 +886,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -871,11 +902,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1716769173, - "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -935,11 +966,11 @@ }, "nur": { "locked": { - "lastModified": 1717054761, - "narHash": "sha256-LBrHEBC0S7C6zjQTsjahAvxxlDH3cbZmEgHiri9o4SM=", + "lastModified": 1719261983, + "narHash": "sha256-J9/+U1U/WdVEBRyPD+FTwgs6TBHED9JTUen8QpkYObA=", "owner": "nix-community", "repo": "nur", - "rev": "a4eff07f9bbcf74522c642c72047ed03c3831501", + "rev": "a21a417c111a1e8263cd0d9b9fe137df17004665", "type": "github" }, "original": { @@ -1054,11 +1085,11 @@ "rust-overlay": "rust-overlay_6" }, "locked": { - "lastModified": 1717097255, - "narHash": "sha256-X6V0Pq0111uCeMn5jh/T2+hO2qz0TkF+os9X8wkKS+M=", + "lastModified": 1718284469, + "narHash": "sha256-6cZjFyjhGTOj9r8eprCWZy1v2o1Tqcl6H6g/LTgHhp4=", "owner": "Xetibo", "repo": "ReSet", - "rev": "40beca475ff60718308767c213b480734559a836", + "rev": "6c1291bd19383ea45d0610dcdc17e8491b8e20ea", "type": "github" }, "original": { @@ -1074,16 +1105,15 @@ "rust-overlay": "rust-overlay_7" }, "locked": { - "lastModified": 1717092514, - "narHash": "sha256-aifR0Jdk1S9OzLYVlJEm4V+Dvm3MXpHYqRDfq2U66uQ=", + "lastModified": 1718300175, + "narHash": "sha256-kPeJJ/au+jV4jhyAhkLI3uwqK7pEDjdVJvwDmtQq8/k=", "owner": "Xetibo", "repo": "ReSet-Plugins", - "rev": "97543b19c416578a83ac68ca010d4b032d87593a", + "rev": "8d3af2fab9425f8b89fb7b82b4e23eba12a42f85", "type": "github" }, "original": { "owner": "Xetibo", - "ref": "dashie", "repo": "ReSet-Plugins", "type": "github" } @@ -1118,11 +1148,11 @@ ] }, "locked": { - "lastModified": 1714443211, - "narHash": "sha256-lKTA3XqRo4aVgkyTSCtpcALpGXdmkilHTtN00eRg0QU=", + "lastModified": 1717121863, + "narHash": "sha256-/3sxIe7MZqF/jw1RTQCSmgTjwVod43mmrk84m50MJQ4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ce35c36f58f82cee6ec959e0d44c587d64281b6f", + "rev": "2a7b53172ed08f856b8382d7dcfd36a4e0cbd866", "type": "github" }, "original": { @@ -1251,11 +1281,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", + "lastModified": 1719111739, + "narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", + "rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811", "type": "github" }, "original": { @@ -1281,16 +1311,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1384,6 +1414,21 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -1401,11 +1446,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { diff --git a/nix/flake.nix b/nix/flake.nix index efddb9d..f87085f 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -18,7 +18,7 @@ Hyprspace = { url = "github:KZDKM/Hyprspace"; - inputs.hyprland.follows = "nixpkgs"; + inputs.hyprland.follows = "hyprland"; }; nur.url = "github:nix-community/nur"; @@ -36,7 +36,7 @@ oxipaste.url = "github:DashieTM/OxiPaste"; hyprdock.url = "github:DashieTM/hyprdock"; reset.url = "github:Xetibo/ReSet"; - reset-plugins.url = "github:Xetibo/ReSet-Plugins?ref=dashie"; + reset-plugins.url = "github:Xetibo/ReSet-Plugins"; }; outputs = { ... }@inputs: diff --git a/nix/hardware/spaceship/base_config.nix b/nix/hardware/spaceship/base_config.nix index da11987..b890e87 100644 --- a/nix/hardware/spaceship/base_config.nix +++ b/nix/hardware/spaceship/base_config.nix @@ -5,7 +5,7 @@ wayland.windowManager.hyprland.settings.monitor = [ # default "DP-2,2560x1440@165,0x0,1" - "DP-1,3440x1440@180,2560x0,1" + "DP-1,3440x1440@180,2560x0,1,vrr,1" "HDMI-A-1,1920x1200@60,6000x0,1" "HDMI-A-1,transform,1" diff --git a/nix/hardware/spaceship/configuration.nix b/nix/hardware/spaceship/configuration.nix index a13352f..012145d 100644 --- a/nix/hardware/spaceship/configuration.nix +++ b/nix/hardware/spaceship/configuration.nix @@ -14,21 +14,19 @@ programs.gamemode = { device = 0; }; - users.extraGroups.vboxusers.members = [ "dashie" ]; virtualisation.virtualbox.host.enable = true; # enable hardware acceleration and rocm hardware.xone.enable = true; - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.extraPackages = with pkgs; [ libvdpau-va-gl vaapiVdpau rocmPackages.clr.icd rocm-opencl-runtime ]; - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = lib.mkDefault true; - driSupport32Bit = lib.mkDefault true; + enable32Bit = lib.mkDefault true; }; boot.initrd.kernelModules = [ "amdgpu" ]; programs.ironbar.monitor = "DP-1"; diff --git a/nix/programs/coding.nix b/nix/programs/coding.nix index 55d8eee..b93c94b 100644 --- a/nix/programs/coding.nix +++ b/nix/programs/coding.nix @@ -40,7 +40,7 @@ mdformat #bash - nodePackages.bash-language-server + bash-language-server shfmt #fsharp diff --git a/nix/programs/common.nix b/nix/programs/common.nix index d0d28b8..5d75166 100644 --- a/nix/programs/common.nix +++ b/nix/programs/common.nix @@ -23,6 +23,7 @@ in fd lsd (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + noto-fonts flatpak networkmanager zoxide @@ -50,6 +51,7 @@ in sops flake-checker ffmpeg + system-config-printer (callPackage ../override/streamdeck.nix { }) @@ -65,11 +67,18 @@ in programs.oxishut.enable = true; programs.oxipaste.enable = true; programs.hyprdock.enable = true; - programs.reset.enable = true; - programs.reset.config.plugins = [ + programs.ReSet.enable = true; + programs.ReSet.config.plugins = [ inputs.reset-plugins.packages."x86_64-linux".monitor + inputs.reset-plugins.packages."x86_64-linux".keyboard ]; - # inputs.reset-plugins.packages#.keyboard_plugin + programs.ReSet.config.plugin_config = { + Keyboard = { + path = "/home/dashie/.config/reset/keyboard.conf"; + }; + }; + + nixpkgs.config.allowUnfree = true; diff --git a/nix/programs/hyprland/config.nix b/nix/programs/hyprland/config.nix index 81acdb2..3d2b43f 100644 --- a/nix/programs/hyprland/config.nix +++ b/nix/programs/hyprland/config.nix @@ -7,6 +7,7 @@ wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.settings = { "$mod" = "SUPER"; + "source" = "/home/dashie/.config/reset/keyboard.conf"; bindm = [ "$mod, mouse:272, movewindow" @@ -151,7 +152,7 @@ }; input = { - kb_layout = "dashie"; + #kb_layout = "dashie"; repeat_delay = 200; force_no_accel = true; touchpad = { @@ -162,7 +163,6 @@ }; misc = { - vrr = 1; animate_manual_resizes = 1; enable_swallow = true; disable_splash_rendering = true; @@ -247,15 +247,15 @@ "oxinoti" ] ++ config.programs.hyprland.extra_autostart; - #plugin = { - # hyprspace = { - # bind = [ - # "SUPER, W, overview:toggle, toggle" - # ]; - # }; - #}; + # plugin = { + # hyprspace = { + # bind = [ + # "SUPER, W, overview:toggle, toggle" + # ]; + # }; + # }; }; - #wayland.windowManager.hyprland.plugins = [ - # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace - #]; + # wayland.windowManager.hyprland.plugins = [ + # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace + # ]; } diff --git a/nix/programs/hyprland/default.nix b/nix/programs/hyprland/default.nix index 6a444ca..5c25085 100644 --- a/nix/programs/hyprland/default.nix +++ b/nix/programs/hyprland/default.nix @@ -20,6 +20,7 @@ copyq gnome.nautilus gnome.sushi + gnome.nautilus-python wl-clipboard hyprcursor hyprpaper diff --git a/nix/programs/individual_configs/firefox.nix b/nix/programs/individual_configs/firefox.nix index 9016730..d55a072 100644 --- a/nix/programs/individual_configs/firefox.nix +++ b/nix/programs/individual_configs/firefox.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, ... }: { +{ pkgs, ... }: { programs.firefox = { enable = true; diff --git a/nix/programs/media.nix b/nix/programs/media.nix index 9d01d83..70c5a4f 100644 --- a/nix/programs/media.nix +++ b/nix/programs/media.nix @@ -16,6 +16,8 @@ libreoffice-fresh onlyoffice-bin pdftk + pdfpc + polylux2pdfpc # spotify #ncspot # video editing diff --git a/nix/programs/nvim/default.nix b/nix/programs/nvim/default.nix index 8dbcc33..fc19224 100644 --- a/nix/programs/nvim/default.nix +++ b/nix/programs/nvim/default.nix @@ -22,7 +22,7 @@ nixpkgs-fmt crate2nix ruff-lsp - nodePackages.pyright + pyright lemminx marksman clang-tools_18 @@ -42,12 +42,15 @@ cmp-nvim-lsp cmp-path cmp_luasnip + cmp-async-path conform-nvim dashboard-nvim dressing-nvim flash-nvim friendly-snippets gitsigns-nvim + git-conflict-nvim + ltex_extra-nvim indent-blankline-nvim lualine-nvim neo-tree-nvim @@ -56,6 +59,12 @@ noice-nvim nui-nvim nvim-cmp + nvim-dap + nvim-dap-ui + nvim-dap-python + nvim-dap-go + nvim-dap-virtual-text + nvim-nio nvim-lint nvim-lspconfig nvim-notify @@ -67,6 +76,22 @@ nvim-ts-context-commentstring nvim-web-devicons nvim-jdtls + rustaceanvim + typst-vim + instant-nvim + git-blame-nvim + neoscroll-nvim + mason-nvim + neotest + neotest-zig + neotest-python + neotest-rust + neotest-java + neotest-haskell + neotest-go + neotest-dotnet + neotest-bash + neotest-dart omnisharp-extended-lsp-nvim neotest neotest-java @@ -75,7 +100,23 @@ plenary-nvim telescope-fzf-native-nvim telescope-nvim + telescope-zoxide + telescope-file-browser-nvim + telescope-project-nvim todo-comments-nvim + vimtex + inc-rename-nvim + headlines-nvim + diffview-nvim + crates-nvim + cmake-tools-nvim + clangd_extensions-nvim + alpha-nvim + vim-visual-multi + ts-comments-nvim + nvim-tree-lua + nvim-snippets + markdown-preview-nvim tokyonight-nvim trouble-nvim vim-illuminate @@ -84,7 +125,6 @@ haskell-tools-nvim Ionide-vim { name = "LuaSnip"; path = luasnip; } - #{ name = "catppuccin"; path = catppuccin-nvim; } { name = "mini.ai"; path = mini-nvim; } { name = "mini.bufremove"; path = mini-nvim; } { name = "mini.comment"; path = mini-nvim; } @@ -131,8 +171,8 @@ { import = "lazyvim.plugins.extras.lang.java" }, { import = "lazyvim.plugins.extras.lang.go" }, { import = "lazyvim.plugins.extras.lang.clangd" }, - { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.lang.python" }, + -- { import = "lazyvim.plugins.extras.lang.typescript" }, + -- { import = "lazyvim.plugins.extras.lang.python" }, { import = "lazyvim.plugins.extras.lang.markdown" }, { import = "lazyvim.plugins.extras.lang.cmake" }, { import = "lazyvim.plugins.extras.lang.omnisharp" }, @@ -145,7 +185,7 @@ { "williamboman/mason-lspconfig.nvim", enabled = false }, --{ "williamboman/mason.nvim", enabled = false }, -- treesitter handled by xdg.configFile."nvim/parser", put this line at the end of spec to clear ensure_installed - { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } }, + --{ "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = {} } }, { import = "plugins" }, { import = "plugins.plugins" }, }, diff --git a/nix/programs/nvim/flake.lock b/nix/programs/nvim/flake.lock new file mode 100644 index 0000000..c9ed8d7 --- /dev/null +++ b/nix/programs/nvim/flake.lock @@ -0,0 +1,69 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717316182, + "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/nix/programs/nvim/flake.nix b/nix/programs/nvim/flake.nix new file mode 100644 index 0000000..ab67de9 --- /dev/null +++ b/nix/programs/nvim/flake.nix @@ -0,0 +1,31 @@ +{ + description = "Dashies neovim config"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + flake-parts = { + url = "github:hercules-ci/flake-parts"; + inputs.nixpkgs-lib.follows = "nixpkgs"; + }; + }; + outputs = + { ... + }@inputs: + let + pkgs = import inputs.nixpkgs { + system = "x86_64-linux"; + overlays = [ + inputs.nur.overlay + ]; + config = { + allowUnfree = true; + }; + }; + in + { + imports = [ ./default.nix { inherit pkgs; } ]; + }; +} diff --git a/nix/programs/nvim/lua/config/autocmds.lua b/nix/programs/nvim/lua/config/autocmds.lua index 291710e..e8da00f 100644 --- a/nix/programs/nvim/lua/config/autocmds.lua +++ b/nix/programs/nvim/lua/config/autocmds.lua @@ -5,7 +5,6 @@ local function open_nvim_tree(data) if not directory then return end - print("FUCK") -- change to the directory vim.cmd.cd(data.file) diff --git a/nix/programs/nvim/lua/config/lazy.lua b/nix/programs/nvim/lua/config/lazy.lua index 858e048..de32dd1 100644 --- a/nix/programs/nvim/lua/config/lazy.lua +++ b/nix/programs/nvim/lua/config/lazy.lua @@ -38,7 +38,6 @@ require("lazy").setup({ lazy = true, version = false, }, - install = { colorscheme = { "tokyonight", "catppuccin-mocha" } }, checker = { enabled = true, notify = false }, change_detection = { enabled = true, notify = false }, performance = { diff --git a/nix/programs/nvim/lua/plugins/cmp.lua b/nix/programs/nvim/lua/plugins/cmp.lua index d8650fc..4b4d467 100644 --- a/nix/programs/nvim/lua/plugins/cmp.lua +++ b/nix/programs/nvim/lua/plugins/cmp.lua @@ -33,7 +33,6 @@ return { "FelipeLema/cmp-async-path", "saadparwaiz1/cmp_luasnip", "Saecki/crates.nvim", - { "roobert/tailwindcss-colorizer-cmp.nvim", config = true }, }, opts = function() vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true }) diff --git a/nix/programs/nvim/lua/plugins/lsp.lua b/nix/programs/nvim/lua/plugins/lsp.lua index 73be574..025637c 100644 --- a/nix/programs/nvim/lua/plugins/lsp.lua +++ b/nix/programs/nvim/lua/plugins/lsp.lua @@ -25,9 +25,6 @@ return { -- LSP Server Settings ---@type lspconfig.options servers = { - rust_analyzer = { - mason = false, - }, marksman = { mason = false, }, diff --git a/nix/programs/nvim/lua/plugins/plugins.lua b/nix/programs/nvim/lua/plugins/plugins.lua index 1a3d63b..a9f20f3 100644 --- a/nix/programs/nvim/lua/plugins/plugins.lua +++ b/nix/programs/nvim/lua/plugins/plugins.lua @@ -5,7 +5,6 @@ return { "LazyVim/LazyVim", opts = { colorscheme = "tokyonight-night", - -- colorscheme = "catppuccin-mocha", }, }, { @@ -94,21 +93,26 @@ return { }, { "nvim-treesitter/nvim-treesitter", - opts = { - textobjects = { - select = { - enable = true, - lookahead = true, - keymaps = { - -- You can use the capture groups defined in textobjects.scm - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["ac"] = "@class.outer", - ["ic"] = "@class.inner", + config = function(_, _) + local opts = { + ensure_installed = {}, + -- parser_install_dir = "~/.config/nvim", + textobjects = { + select = { + enable = true, + lookahead = true, + keymaps = { + -- You can use the capture groups defined in textobjects.scm + ["af"] = "@function.outer", + ["if"] = "@function.inner", + ["ac"] = "@class.outer", + ["ic"] = "@class.inner", + }, }, }, - }, - }, + } + require("nvim-treesitter.configs").setup(opts) + end, }, { "karb94/neoscroll.nvim", @@ -162,7 +166,7 @@ return { }, { "barreiroleo/ltex_extra.nvim", - ft = { "markdown", "tex", "typst", "typ" }, + ft = { "tex", "typst", "typ" }, lazy = true, }, { @@ -256,13 +260,6 @@ return { }, }, }, - { - "DashieTM/test_plugin", - lazy = false, - opts = { - what = 0, - }, - }, { "DreamMaoMao/yazi.nvim", dependencies = { diff --git a/nix/programs/oxi/oxinoti.nix b/nix/programs/oxi/oxinoti.nix index 9ccf6cb..9e2d4e8 100644 --- a/nix/programs/oxi/oxinoti.nix +++ b/nix/programs/oxi/oxinoti.nix @@ -1,6 +1,6 @@ { xdg.configFile."oxinoti/style.css" = { - text = + text = /*css*/ '' @import url("/home/dashie/.config/gtk-3.0/gtk.css"); diff --git a/nix/programs/themes/kvantum.nix b/nix/programs/themes/kvantum.nix new file mode 100644 index 0000000..233def3 --- /dev/null +++ b/nix/programs/themes/kvantum.nix @@ -0,0 +1,154 @@ +{ + xdg.configFile."kvantum/colors/tokyonight.colors" = { + text = + '' + [ColorEffects:Disabled] + Color=56,56,56 + ColorAmount=0.15000000000000002 + ColorEffect=2 + ContrastAmount=0.8 + ContrastEffect=1 + IntensityAmount=-1 + IntensityEffect=2 + + [ColorEffects:Inactive] + ChangeSelectionColor=true + Color=112,111,110 + ColorAmount=0.025 + ColorEffect=2 + ContrastAmount=0.1 + ContrastEffect=2 + Enable=false + IntensityAmount=0 + IntensityEffect=0 + + [Colors:Button] + BackgroundAlternate=157,221,203 + BackgroundNormal=44,45,55 + DecorationFocus=164,185,239 + DecorationHover=164,185,239 + ForegroundActive=164,185,239 + ForegroundInactive=120,124,153 + ForegroundLink=164,185,239 + ForegroundNegative=226,140,140 + ForegroundNeutral=247,193,150 + ForegroundNormal=215,218,224 + ForegroundPositive=179,225,163 + ForegroundVisited=173,142,230 + + [Colors:Complementary] + BackgroundAlternate=157,221,203 + BackgroundNormal=30,30,41 + DecorationFocus=164,185,239 + DecorationHover=164,185,239 + ForegroundActive=164,185,239 + ForegroundInactive=110,108,124 + ForegroundLink=164,185,239 + ForegroundNegative=226,140,140 + ForegroundNeutral=247,193,150 + ForegroundNormal=215,218,224 + ForegroundPositive=179,225,163 + ForegroundVisited=198,170,232 + + [Colors:Header] + BackgroundAlternate=30,30,41 + BackgroundNormal=30,30,41 + DecorationFocus=164,185,239 + DecorationHover=164,185,239 + ForegroundActive=164,185,239 + ForegroundInactive=110,108,124 + ForegroundLink=164,185,239 + ForegroundNegative=226,140,140 + ForegroundNeutral=247,193,150 + ForegroundNormal=215,218,224 + ForegroundPositive=179,225,163 + ForegroundVisited=198,170,232 + + [Colors:Header][Inactive] + BackgroundAlternate=49,54,59 + BackgroundNormal=22,22,29 + DecorationFocus=61,174,233 + DecorationHover=61,174,233 + ForegroundActive=61,174,233 + ForegroundInactive=161,169,177 + ForegroundLink=29,153,243 + ForegroundNegative=218,68,83 + ForegroundNeutral=246,116,0 + ForegroundNormal=252,252,252 + ForegroundPositive=39,174,96 + ForegroundVisited=155,89,182 + + [Colors:Selection] + BackgroundAlternate=157,221,203 + BackgroundNormal=164,187,239 + DecorationFocus=30,30,41 + DecorationHover=30,30,41 + ForegroundActive=21,18,28 + ForegroundInactive=120,124,153 + ForegroundLink=21,18,28 + ForegroundNegative=225,139,139 + ForegroundNeutral=247,193,150 + ForegroundNormal=20,21,30 + ForegroundPositive=179,225,163 + ForegroundVisited=173,142,230 + + [Colors:Tooltip] + BackgroundAlternate=22,22,29 + BackgroundNormal=26,27,38 + DecorationFocus=164,185,239 + DecorationHover=164,185,239 + ForegroundActive=164,185,239 + ForegroundInactive=120,124,153 + ForegroundLink=164,185,239 + ForegroundNegative=226,140,140 + ForegroundNeutral=247,193,150 + ForegroundNormal=215,218,224 + ForegroundPositive=179,225,163 + ForegroundVisited=173,142,230 + + [Colors:View] + BackgroundAlternate=22,22,29 + BackgroundNormal=26,27,38 + DecorationFocus=164,185,239 + DecorationHover=164,185,239 + ForegroundActive=164,185,239 + ForegroundInactive=120,124,153 + ForegroundLink=164,185,239 + ForegroundNegative=226,140,140 + ForegroundNeutral=247,193,150 + ForegroundNormal=215,218,224 + ForegroundPositive=179,225,163 + ForegroundVisited=173,142,230 + + [Colors:Window] + BackgroundAlternate=22,22,29 + BackgroundNormal=26,27,38 + DecorationFocus=164,185,239 + DecorationHover=164,185,239 + ForegroundActive=164,185,239 + ForegroundInactive=120,124,153 + ForegroundLink=164,185,239 + ForegroundNegative=226,140,140 + ForegroundNeutral=247,193,150 + ForegroundNormal=215,218,224 + ForegroundPositive=179,225,163 + ForegroundVisited=173,142,230 + + [General] + ColorScheme=BreezeDark + Name=Tokyo Night + shadeSortColumn=true + + [KDE] + contrast=4 + + [WM] + activeBackground=26,27,38 + activeBlend=215,218,224 + activeForeground=215,218,224 + inactiveBackground=26,27,38 + inactiveBlend=110,108,124 + inactiveForeground=110,108,124 + ''; + }; +} diff --git a/nix/programs/themes/qt.nix b/nix/programs/themes/qt.nix index 68fb5e5..13a003a 100644 --- a/nix/programs/themes/qt.nix +++ b/nix/programs/themes/qt.nix @@ -30,8 +30,8 @@ in [Appearance] color_scheme_path=/home/dashie/.config/qt5ct/colors/tokyonight.conf custom_palette=true - icon_theme=breeze - standard_dialogs=default + icon_theme=MoreWaita + standard_dialogs=gtk3 style=Breeze [Fonts] @@ -48,19 +48,13 @@ in keyboard_scheme=4 menus_have_icons=true show_shortcuts_in_context_menus=true - stylesheets=/home/dashie/.config/qt5ct/qss/tab.qss + stylesheets=/home/dashie/.config/qt5ct/qss/tab.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/fusion-fixes.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/scrollbar-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/sliders-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/tooltip-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/traynotification-simple.qss toolbutton_style=4 underline_shortcut=0 wheel_scroll_lines=3 - [PaletteEditor] - geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\n\0\0\0\0\0\0\0\fv\0\0\x2\x10\0\0\n\0\0\0\0\0\0\0\fv\0\0\x2\x10\0\0\0\0\x2\0\0\0\rp\0\0\n\0\0\0\0\0\0\0\fv\0\0\x2\x10) - - [QSSEditor] - geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2\0\0\0\x2\x2\0\0\0\n\0\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2) - [SettingsWindow] - geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\n\0\0\0\0\0\0\0\r\x83\0\0\x2\x94\0\0\n\0\0\0\0\0\0\0\fO\0\0\x2\xbf\0\0\0\0\x2\0\0\0\rp\0\0\n\0\0\0\0\0\0\0\r\x83\0\0\x2\x94) + geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\n\0\0\0\0\0\0\0\rK\0\0\x5q\0\0\n\0\0\0\0\0\0\0\r[\0\0\x5\x7f\0\0\0\0\x2\0\0\0\rp\0\0\n\0\0\0\0\0\0\0\rK\0\0\x5q) [Troubleshooting] force_raster_widgets=1