reidlab/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: reidlab:edfb60dd12a66994d06c54641305a030149a6715
Branches Tags
reidlab:main
..
compare: reidlab:bb229a4aef74baffd9cebf72cf469e1f1d4ab2e6
Branches Tags
reidlab:main

No commits in common. "edfb60dd12a66994d06c54641305a030149a6715" and "bb229a4aef74baffd9cebf72cf469e1f1d4ab2e6" have entirely different histories.
edfb60dd12 ... bb229a4aef

28 changed files with 342 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

422
flake.lock generated
View file

@ -16,71 +16,16 @@
"type": "github" "type": "github"
} }
}, },
"cachyos-kernel": { "catppuccin": {
"inputs": { "inputs": {
"cachyos-kernel": "cachyos-kernel_2",
"cachyos-kernel-patches": "cachyos-kernel-patches",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1776386586, "lastModified": 1765485905,
"narHash": "sha256-eVAUaL/6n8mnmBiPpEVW1NDNVSKLWhYVfycG+P0SvWU=", "narHash": "sha256-fk6zFzzcwz6su99K7UTxS2497+z/Cdk3FzNsacsmZKA=",
"owner": "xddxdd",
"repo": "nix-cachyos-kernel",
"rev": "c65c3faf90ae07bae101c15ef502f0bcb06c5d74",
"type": "github"
},
"original": {
"owner": "xddxdd",
"ref": "release",
"repo": "nix-cachyos-kernel",
"type": "github"
}
},
"cachyos-kernel-patches": {
"flake": false,
"locked": {
"lastModified": 1776355454,
"narHash": "sha256-b9Hc0sTxjEzDbphzS9yQqxVha/7bsPIs2cQQQvaG45E=",
"owner": "CachyOS",
"repo": "kernel-patches",
"rev": "b5e029226df5cc30c103651072d49a7af2878202",
"type": "github"
},
"original": {
"owner": "CachyOS",
"repo": "kernel-patches",
"type": "github"
}
},
"cachyos-kernel_2": {
"flake": false,
"locked": {
"lastModified": 1776183001,
"narHash": "sha256-lvLKB5dTqjO1S/YonS9ZyWemEjO6QXtN4D76rYEYy4s=",
"owner": "CachyOS",
"repo": "linux-cachyos",
"rev": "4224303b6d7a50dd1cc3ffa78864050cc9536eec",
"type": "github"
},
"original": {
"owner": "CachyOS",
"repo": "linux-cachyos",
"type": "github"
}
},
"catppuccin": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1776420287,
"narHash": "sha256-0P2QyDM8R1FFww//TNDLTRVnVkQxVdbEVQiVuyD1SqY=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "bdf0285dc7978ebd78b76054631d7ef05680895e", "rev": "b49c675acd80931fc8b54290920a90189b461dcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,64 +34,14 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fuzzel-catppuccin": { "fuzzel-catppuccin": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1771578346, "lastModified": 1730302879,
"narHash": "sha256-+/7lxQTRDZ0m+GAAFIjvFt8EXDeqZUtv0pLnNgaauZw=", "narHash": "sha256-XpItMGsYq4XvLT+7OJ9YRILfd/9RG1GMuO6J4hSGepg=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "fuzzel", "repo": "fuzzel",
"rev": "879879da8a7dc58f173b4cd7987723fd19bef6d5", "rev": "0af0e26901b60ada4b20522df739f032797b07c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,11 +52,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1775490113, "lastModified": 1764440730,
"narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -177,11 +72,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776454077, "lastModified": 1765682243,
"narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=", "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "565e5349208fe7d0831ef959103c9bafbeac0681", "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,11 +101,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772461523, "lastModified": 1763733840,
"narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=", "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804", "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,7 +114,84 @@
"type": "github" "type": "github"
} }
}, },
"hypridle": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_2",
"systems": "systems"
},
"locked": {
"lastModified": 1762027241,
"narHash": "sha256-w0NhWx95Xao6Dh3G1p7G1cHwGBknwPVPG5VRghk3LSg=",
"owner": "hyprwm",
"repo": "hypridle",
"rev": "f3d1f3b232a5e3267008568196397b03fab244d2",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hypridle",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hypridle",
"nixpkgs"
],
"systems": [
"hypridle",
"systems"
]
},
"locked": {
"lastModified": 1749046714,
"narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprlang": { "hyprlang": {
"inputs": {
"hyprutils": [
"hypridle",
"hyprutils"
],
"nixpkgs": [
"hypridle",
"nixpkgs"
],
"systems": [
"hypridle",
"systems"
]
},
"locked": {
"lastModified": 1749145882,
"narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_2": {
"inputs": { "inputs": {
"hyprutils": [ "hyprutils": [
"hyprlock", "hyprlock",
@ -235,11 +207,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772459629, "lastModified": 1764612430,
"narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=", "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "7615ee388de18239a4ab1400946f3d0e498a8186", "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -251,20 +223,20 @@
"hyprlock": { "hyprlock": {
"inputs": { "inputs": {
"hyprgraphics": "hyprgraphics", "hyprgraphics": "hyprgraphics",
"hyprlang": "hyprlang", "hyprlang": "hyprlang_2",
"hyprutils": "hyprutils", "hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1776434938, "lastModified": 1765358139,
"narHash": "sha256-D2h3Q8owYExKK03bEgZBJzO9AfahvFMEX+poKoHLIpM=", "narHash": "sha256-1hIq5gSfV0xc7gaBQDVk3XPv47vjhlc8qbAskOqT4b0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlock", "repo": "hyprlock",
"rev": "64ad702b26646e20019e6d05d7b35d0781d5db83", "rev": "e2da7c6b1fceee9358229a3b5ca48127cd2c427c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -276,20 +248,20 @@
"hyprutils": { "hyprutils": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprlock", "hypridle",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"hyprlock", "hypridle",
"systems" "systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1772459870, "lastModified": 1749135356,
"narHash": "sha256-xxkK2Cvqxpf/4UGcJ/TyCwrvmiNWsKsJfFzHMp2bxis=", "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "e63f3a79334dec49f8eb1691f66f18115df04085", "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,7 +270,7 @@
"type": "github" "type": "github"
} }
}, },
"hyprwayland-scanner": { "hyprutils_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprlock", "hyprlock",
@ -310,11 +282,61 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772459835, "lastModified": 1764962281,
"narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=", "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hypridle",
"nixpkgs"
],
"systems": [
"hypridle",
"systems"
]
},
"locked": {
"lastModified": 1749145760,
"narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "0a692d4a645165eebd65f109146b8861e3a925e7", "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"hyprwayland-scanner_2": {
"inputs": {
"nixpkgs": [
"hyprlock",
"nixpkgs"
],
"systems": [
"hyprlock",
"systems"
]
},
"locked": {
"lastModified": 1763640274,
"narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,16 +355,15 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1776462508, "lastModified": 1765714461,
"narHash": "sha256-Hzrtpn7gUP6Xjwl9Lz1+vwxkQYCgKt2o0qLc6u4eLYY=", "narHash": "sha256-P9kQIIPSCqmKyHD/9wFZ4ezlqofnAzYBmolSF1f5xog=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "4ffa832159b8f7f3ac8879102011f0a47a8db11e", "rev": "ded1462ebc03ed723f0f9f5514e72469da687817",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "sodiboo", "owner": "sodiboo",
"ref": "pull/1731/head",
"repo": "niri-flake", "repo": "niri-flake",
"type": "github" "type": "github"
} }
@ -367,11 +388,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1776363469, "lastModified": 1765687800,
"narHash": "sha256-MH7ieeYawsCAjGkoHFZfUDZXplEOiFgSpx2pGr5RK3c=", "narHash": "sha256-Erk+ypR8N+rCvjMdUB1N/v4jtm4QRH9k7r/9zh2HyC8=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "82d4c7569e731379284e0653dcdadb8f17cceec7", "rev": "7c0898570ca5bd3f10fbf4cf2f8a00edc48d787b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -383,7 +404,7 @@
"nix-colors": { "nix-colors": {
"inputs": { "inputs": {
"base16-schemes": "base16-schemes", "base16-schemes": "base16-schemes",
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1707825078, "lastModified": 1707825078,
@ -406,11 +427,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775970782, "lastModified": 1765267181,
"narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=", "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "bedba5989b04614fc598af9633033b95a937933f", "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,36 +442,21 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1776311487, "lastModified": 1763966396,
"narHash": "sha256-9U8bL9X/0R9cZD3Uc/mN37AWvv5dB4WQqqjLRAxQfas=", "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cc1e0e027707ad53dddae39d3b3e992262c7d8c7", "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable-small", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": {
"lastModified": 1774748309,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1697935651, "lastModified": 1697935651,
"narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
@ -467,11 +473,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1776221942, "lastModified": 1765608474,
"narHash": "sha256-FbQAeVNi7G4v3QCSThrSAAvzQTmrmyDLiHNPvTF2qFM=", "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1766437c5509f444c1b15331e82b8b6a9b967000", "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -483,11 +489,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1776169885, "lastModified": 1748929857,
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,11 +505,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1776169885, "lastModified": 1765472234,
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -515,11 +521,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1776169885, "lastModified": 1765472234,
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -563,18 +569,18 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"cachyos-kernel": "cachyos-kernel",
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"fuzzel-catppuccin": "fuzzel-catppuccin", "fuzzel-catppuccin": "fuzzel-catppuccin",
"hardware": "hardware", "hardware": "hardware",
"home-manager": "home-manager", "home-manager": "home-manager",
"hypridle": "hypridle",
"hyprlock": "hyprlock", "hyprlock": "hyprlock",
"niri": "niri", "niri": "niri",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"rofi-catppuccin": "rofi-catppuccin", "rofi-catppuccin": "rofi-catppuccin",
"systems": "systems_2", "systems": "systems_3",
"vicinae": "vicinae", "vicinae": "vicinae",
"vicinae-extensions": "vicinae-extensions", "vicinae-extensions": "vicinae-extensions",
"waybar-catppuccin": "waybar-catppuccin" "waybar-catppuccin": "waybar-catppuccin"
@ -612,16 +618,16 @@
}, },
"systems_3": { "systems_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1689347949,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default", "repo": "default-linux",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default", "repo": "default-linux",
"type": "github" "type": "github"
} }
}, },
@ -640,17 +646,32 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"vicinae": { "vicinae": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1776435302, "lastModified": 1774140862,
"narHash": "sha256-MSmlvbsg2kc2DdQGBR+3Shta+Spgi4A2k5tkbTnrro8=", "narHash": "sha256-OQC0RntH2eeSGYGnG5C8kdKxnJIi+KYh7usLMoBVYec=",
"owner": "vicinaehq", "owner": "vicinaehq",
"repo": "vicinae", "repo": "vicinae",
"rev": "9fb1f6d2f882ebf36ab19919e99ca36ad7e06c9b", "rev": "9076d4cba5bcade305b7e78cd68759ad2b34a5a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -661,19 +682,18 @@
}, },
"vicinae-extensions": { "vicinae-extensions": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_4", "systems": "systems_5",
"vicinae": "vicinae_2" "vicinae": "vicinae_2"
}, },
"locked": { "locked": {
"lastModified": 1775911073, "lastModified": 1773786526,
"narHash": "sha256-Fa5JvMFVwBzbnOjEV2Cer8ak0zF/CDwdHT7+wslL30w=", "narHash": "sha256-GVIbXYiA506LV0cEsG1AA4vTwDJq9R6v6lFFs8z7knY=",
"owner": "vicinaehq", "owner": "vicinaehq",
"repo": "extensions", "repo": "extensions",
"rev": "d12bcb134d45dedad1a28a18e1cd8807353338d0", "rev": "50233dff9dfc70fc6b39c2387687e5661b09f005",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -743,11 +763,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773622265, "lastModified": 1765343581,
"narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "a879e5e0896a326adc79c474bf457b8b99011027", "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -14,9 +14,7 @@
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.url = "github:nix-community/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; niri.url = "github:sodiboo/niri-flake";
niri.url = "github:sodiboo/niri-flake/pull/1731/head";
vicinae.url = "github:vicinaehq/vicinae"; vicinae.url = "github:vicinaehq/vicinae";
vicinae-extensions.url = "github:vicinaehq/extensions"; vicinae-extensions.url = "github:vicinaehq/extensions";
@ -24,6 +22,7 @@
hyprlock.url = "github:hyprwm/hyprlock"; hyprlock.url = "github:hyprwm/hyprlock";
hyprlock.inputs.nixpkgs.follows = "nixpkgs"; hyprlock.inputs.nixpkgs.follows = "nixpkgs";
hypridle.url = "github:hyprwm/hypridle";
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix";
@ -59,7 +58,6 @@
pkgsFor = eachSystem (system: pkgsFor = eachSystem (system:
mkPkgs system nixpkgs [ mkPkgs system nixpkgs [
self.overlays.default self.overlays.default
inputs.cachyos-kernel.overlays.pinned
inputs.niri.overlays.niri inputs.niri.overlays.niri
] ]
); );

9
hosts/flubber-machine/default.nix
View file

@ -17,11 +17,11 @@
# system # system
btop duf lm_sensors ethtool pciutils usbutils powertop killall btop duf lm_sensors ethtool pciutils usbutils powertop killall
# debug # debug
strace ltrace lsof crosspipe strace ltrace lsof helvum
# apps # apps
firefox qalculate-gtk krita inkscape onlyoffice-desktopeditors vlc nicotine-plus transmission_4-gtk font-manager obs-studio imhex pwvucontrol nautilus gnome-disk-utility gnome-text-editor baobab file-roller mission-center loupe gnome-weather kdePackages.kdenlive video-trimmer blanket firefox qalculate-gtk krita inkscape onlyoffice-desktopeditors vlc nicotine-plus transmission_4-gtk font-manager obs-studio imhex pwvucontrol nautilus gnome-disk-utility gnome-text-editor baobab file-roller mission-center loupe gnome-weather kdePackages.kdenlive video-trimmer blanket
# compatibility # compatibility
wineWow64Packages.waylandFull winetricks wineWowPackages.waylandFull winetricks
# misc # misc
bat file which packwiz yt-dlp fastfetch hyfetch trashy wev bat file which packwiz yt-dlp fastfetch hyfetch trashy wev
# games # games
@ -30,7 +30,7 @@
# none yet # none yet
]); ]);
boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v3; boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
modules = { modules = {
security.useDoas = true; security.useDoas = true;
@ -58,7 +58,7 @@
hyprlock.enable = true; hyprlock.enable = true;
hypridle.enable = true; hypridle.enable = true;
hypridle.desktop = true; hypridle.desktop = true;
awww.enable = true; swww.enable = true;
gnome-keyring.enable = true; gnome-keyring.enable = true;
mate-polkit.enable = true; mate-polkit.enable = true;
dunst.enable = true; dunst.enable = true;
@ -104,6 +104,7 @@
distractions.discord.enable = true; distractions.discord.enable = true;
distractions.discord.vesktop = true; distractions.discord.vesktop = true;
distractions.steam.enable = true; distractions.steam.enable = true;
distractions.steam.useGamescope = true;
# tools # tools
tools.gpg.enable = true; tools.gpg.enable = true;
tools.rbw.enable = true; tools.rbw.enable = true;

7
hosts/flubber-machine/hardware.nix
View file

@ -9,6 +9,8 @@
inputs.hardware.nixosModules.common-pc inputs.hardware.nixosModules.common-pc
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
./omen-30l-gt13-1xxx.nix
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
@ -19,11 +21,6 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# radv > amdvlk
environment.variables.AMD_VULKAN_ICD = "RADV";
environment.systemPackages = with pkgs; [ amdgpu_top ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/5da6bab0-856a-4e65-8ff6-5b70fe3764b8"; { device = "/dev/disk/by-uuid/5da6bab0-856a-4e65-8ff6-5b70fe3764b8";
fsType = "btrfs"; fsType = "btrfs";

18
hosts/flubber-machine/omen-30l-gt13-1xxx.nix Normal file
View file

@ -0,0 +1,18 @@
{ pkgs, lib, ... }:
{
# support power features such as suspend to ram
powerManagement.enable = true;
environment.variables = {
AMD_VULKAN_ICD = "RADV";
LIBVA_DRIVER_NAME= "radeonsi";
VDPAU_DRIVER = "radeonsi";
};
environment.systemPackages = with pkgs; [ amdgpu_top ];
# fix audio issues: https://forums.linuxmint.com/viewtopic.php?t=445461
boot.extraModprobeConfig = ''
options snd_hda_intel model=generic
'';
}

7
hosts/goopnet-interface/apple-macbook-air-9-1.nix
View file

@ -14,12 +14,7 @@
# better performance than the actual intel driver # better performance than the actual intel driver
services.xserver.videoDrivers = [ "modesetting" ]; services.xserver.videoDrivers = [ "modesetting" ];
# replace basic t2 kernel with cachyos kernel hardware.apple-t2.kernelChannel = "stable"; # TODO: latest is EOL? change back to latest when upd
# same patches and i trust it to be more up to date (one time the "latest" was EOL for t2,,,)
# also interesting how this supports l4 but my big computer doesn't...
boot.kernelPackages = lib.mkForce pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v4;
# fix wifi firmware
hardware.apple-t2.firmware.enable = true; hardware.apple-t2.firmware.enable = true;
environment.variables = { environment.variables = {

7
hosts/goopnet-interface/default.nix
View file

@ -17,11 +17,11 @@
# system # system
btop duf lm_sensors ethtool pciutils usbutils powertop killall btop duf lm_sensors ethtool pciutils usbutils powertop killall
# debug # debug
strace ltrace lsof crosspipe strace ltrace lsof helvum
# apps # apps
firefox qalculate-gtk krita inkscape onlyoffice-desktopeditors vlc nicotine-plus transmission_4-gtk font-manager obs-studio imhex pwvucontrol nautilus gnome-disk-utility gnome-text-editor baobab file-roller mission-center loupe gnome-weather kdePackages.kdenlive video-trimmer blanket firefox qalculate-gtk krita inkscape onlyoffice-desktopeditors vlc nicotine-plus transmission_4-gtk font-manager obs-studio imhex pwvucontrol nautilus gnome-disk-utility gnome-text-editor baobab file-roller mission-center loupe gnome-weather kdePackages.kdenlive video-trimmer blanket
# compatibility # compatibility
wineWow64Packages.waylandFull winetricks wineWowPackages.waylandFull winetricks
# misc # misc
bat file which packwiz yt-dlp fastfetch hyfetch trashy wev bat file which packwiz yt-dlp fastfetch hyfetch trashy wev
# games # games
@ -53,7 +53,7 @@
# accessories # accessories
hyprlock.enable = true; hyprlock.enable = true;
hypridle.enable = true; hypridle.enable = true;
awww.enable = true; swww.enable = true;
gnome-keyring.enable = true; gnome-keyring.enable = true;
mate-polkit.enable = true; mate-polkit.enable = true;
dunst.enable = true; dunst.enable = true;
@ -98,6 +98,7 @@
distractions.discord.enable = true; distractions.discord.enable = true;
distractions.discord.vesktop = true; distractions.discord.vesktop = true;
distractions.steam.enable = true; distractions.steam.enable = true;
distractions.steam.useGamescope = true;
# tools # tools
tools.gpg.enable = true; tools.gpg.enable = true;
tools.rbw.enable = true; tools.rbw.enable = true;

3
modules/desktop/default.nix
View file

@ -16,6 +16,9 @@ in {
modules.desktop.fonts.enable = true; modules.desktop.fonts.enable = true;
modules.desktop.fonts.baseFonts = true; modules.desktop.fonts.baseFonts = true;
modules.desktop.thumbnailers.enable = true; modules.desktop.thumbnailers.enable = true;
# speed up boot
# https://discourse.nixos.org/t/boot-faster-by-disabling-udev-settle-and-nm-wait-online/6339
systemd.services.systemd-udev-settle.enable = false; systemd.services.systemd-udev-settle.enable = false;
# mounting, trash, and mtp support # mounting, trash, and mtp support

20
modules/desktop/dunst.nix
View file

@ -20,25 +20,36 @@ in {
frame_color = "#${base02}"; frame_color = "#${base02}";
origin = "top-right"; origin = "top-right";
vertical_alignment = "center";
ellipsize = "middle";
# various non-color theming settings # various non-color theming settings
offset = "15x15"; offset = "15x15";
padding = 15; padding = 15;
horizontal_padding = 15; horizontal_padding = 15;
text_icon_padding = 15; text_icon_padding = 15;
corner_radius = 8; corner_radius = 8;
gap_size = 0; gap_size = 8;
frame_width = 1; frame_width = 1;
icon_position = "left"; icon_position = "left";
min_icon_size = 48;
max_icon_size = 64;
progress_bar = true; progress_bar = true;
progress_bar_height = 8;
progress_bar_frame_width = 1; progress_bar_frame_width = 1;
progress_bar_corner_radius = 8; progress_bar_min_width = 150;
progress_bar_max_width = 300;
alignment = "left"; alignment = "left";
markup = "full"; markup = "full";
format = "<b>%a</b>\\n<b>%s</b>\\n%b"; format = "<b>%a</b>\\n<b>%s</b>\\n%b";
font = with config.modules.desktop.fonts.fonts; "${sansSerif.family} ${toString sansSerif.size}"; font = with config.modules.desktop.fonts.fonts; "${sansSerif.family} ${toString sansSerif.size}";
word_wrap = "yes";
ignore_newline = "no";
ignore_dbusclose = false;
mouse_left_click = "do_action, close_current"; mouse_left_click = "do_action, close_current";
mouse_middle_click = "close_all"; mouse_middle_click = "close_all";
@ -46,13 +57,16 @@ in {
# sorting and history settings # sorting and history settings
sort = "update"; sort = "update";
notification_limit = 4;
indicate_hidden = "yes"; indicate_hidden = "yes";
notification_limit = 5;
idle_threshold = 120; idle_threshold = 120;
history_length = 20; history_length = 20;
show_age_threshold = 60; show_age_threshold = 60;
show_indicators = "yes"; show_indicators = "yes";
sticky_history = "yes"; sticky_history = "yes";
stack_duplicates = true;
hide_duplicate_count = false;
always_run_script = true;
}; };
urgency_low = { urgency_low = {

4
modules/desktop/hypridle.nix
View file

@ -1,4 +1,4 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, system, inputs , ... }:
with lib; with lib;
let let
@ -8,7 +8,7 @@ in {
enable = mkEnableOption "Enable hypridle, a wayland idle daemon"; enable = mkEnableOption "Enable hypridle, a wayland idle daemon";
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.hypridle; default = inputs.hypridle.packages.${system}.hypridle;
example = "pkgs.hypridle"; example = "pkgs.hypridle";
}; };
desktop = mkEnableOption "Extend screen dimming time and disable sleeping"; desktop = mkEnableOption "Extend screen dimming time and disable sleeping";

2
modules/desktop/hyprlock.nix
View file

@ -28,7 +28,7 @@ in {
}; };
background = [ background = [
{ {
path = "${config.modules.desktop.awww.lastWallpaperSym}"; path = "${config.modules.desktop.swww.lastWallpaperSym}";
color = "rgb(${base00})"; color = "rgb(${base00})";
blur_passes = 3; blur_passes = 3;
blur_size = 6; blur_size = 6;

2
modules/desktop/mate-polkit.nix
View file

@ -22,7 +22,7 @@ in {
Service = { Service = {
Type = "simple"; Type = "simple";
ExecStart = "${pkgs.mate-polkit}/libexec/polkit-mate-authentication-agent-1"; ExecStart = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 5; RestartSec = 5;
}; };

27
modules/desktop/niri.nix
View file

@ -101,14 +101,6 @@ in {
}; };
}; };
blur = {
enable = true;
passes = 2;
offset = 2;
noise = 0.04;
saturation = 1.5;
};
overview = { overview = {
backdrop-color = config.modules.desktop.themes.niri.background; backdrop-color = config.modules.desktop.themes.niri.background;
workspace-shadow = { workspace-shadow = {
@ -226,24 +218,14 @@ in {
}; };
}; };
# TODO: configure popups
window-rules = [ window-rules = [
{ {
geometry-corner-radius = allCorners 10.0; geometry-corner-radius = allCorners 10.0;
clip-to-geometry = true; clip-to-geometry = true;
} }
{ {
matches = [ matches = [ { app-id = "^org\.wezfurlong\.wezterm$"; } ];
{ app-id = "^org\.wezfurlong\.wezterm$"; } shadow.draw-behind-window = false; # transparent bg
];
shadow.draw-behind-window = false;
background-effect.blur = true;
}
{
matches = [
{ is-floating = true; }
];
background-effect.xray = false;
} }
{ {
matches = [ matches = [
@ -310,6 +292,7 @@ in {
]; ];
# TODO: add shadows onto notifications. weird geometry beware !!! # TODO: add shadows onto notifications. weird geometry beware !!!
# TODO: add shadows onto waybar again, but make it show the shadow drops behind the windows
# TODO: rounded vicinae # TODO: rounded vicinae
layer-rules = [ layer-rules = [
{ {
@ -329,10 +312,6 @@ in {
{ namespace = "^vicinae$"; } { namespace = "^vicinae$"; }
{ namespace = "^wob$"; } { namespace = "^wob$"; }
]; ];
background-effect = {
blur = true;
xray = false;
};
shadow = { shadow = {
enable = true; enable = true;
}; };

5
modules/desktop/regreet.nix
View file

@ -13,11 +13,16 @@ in {
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = { settings = {
# TODO: probably should rewrite somehow,,,
# this is ugly, but it SOMEHOW WORKS??
# kind of beautiful in its own way
default_session = let default_session = let
swayConfig = let swayConfig = let
monitors = config.modules.desktop.monitors; monitors = config.modules.desktop.monitors;
monitorConfig = if monitors.enable && (builtins.length monitors.monitors > 0) then monitorConfig = if monitors.enable && (builtins.length monitors.monitors > 0) then
let let
# TODO: rewrite primary monitor system
# it will get repetitive..
firstMonitor = builtins.head monitors.monitors; firstMonitor = builtins.head monitors.monitors;
in in
"output ${firstMonitor.name} scale ${toString firstMonitor.scale}" "output ${firstMonitor.name} scale ${toString firstMonitor.scale}"

28
modules/desktop/awww.nix → modules/desktop/swww.nix
View file

@ -2,20 +2,20 @@
with lib; with lib;
let let
cfg = config.modules.desktop.awww; cfg = config.modules.desktop.swww;
# TODO: this whole thing is a little silly, but i cant find a better way to ref it in the scripts # TODO: this whole thing is a little silly, but i cant find a better way to ref it in the scripts
# maybe we can reference the config in the scripts? in a let of course :) # maybe we can reference the config in the scripts? in a let of course :)
wallpapersFolder = "${pkgs.my.wallpapers}/share/backgrounds"; wallpapersFolder = "${pkgs.my.wallpapers}/share/backgrounds";
lastWallpaper = "$XDG_DATA_HOME/awww-last-wallpaper"; lastWallpaper = "$XDG_DATA_HOME/swww-last-wallpaper";
lastWallpaperSym = "$XDG_DATA_HOME/awww-last-wallpaper-sym"; lastWallpaperSym = "$XDG_DATA_HOME/swww-last-wallpaper-sym";
in { in {
options.modules.desktop.awww = { options.modules.desktop.swww = {
enable = mkEnableOption "Enable awww, an Answer to your Wayland Wallpaper Woes"; enable = mkEnableOption "Enable swww, a Solution to your Wayland Wallpaper Woes";
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.awww; default = pkgs.swww;
example = "pkgs.awww"; example = "pkgs.swww";
}; };
wallpapersFolder = mkOption { wallpapersFolder = mkOption {
type = types.str; type = types.str;
@ -25,16 +25,16 @@ in {
lastWallpaper = mkOption { lastWallpaper = mkOption {
type = types.str; type = types.str;
default = lastWallpaper; default = lastWallpaper;
example = "$XDG_DATA_HOME/awww-last-wallpaper"; example = "$XDG_DATA_HOME/swww-last-wallpaper";
}; };
lastWallpaperSym = mkOption { lastWallpaperSym = mkOption {
type = types.str; type = types.str;
default = lastWallpaperSym; default = lastWallpaperSym;
example = "$XDG_DATA_HOME/awww-last-wallpaper-sym"; example = "$XDG_DATA_HOME/swww-last-wallpaper-sym";
}; };
setScript = mkOption { setScript = mkOption {
type = types.package; type = types.package;
default = pkgs.writeShellScript "awww-set" '' default = pkgs.writeShellScript "swww-set" ''
set -euo pipefail set -euo pipefail
if [ ! -f "${lastWallpaper}" ]; then if [ ! -f "${lastWallpaper}" ]; then
@ -47,7 +47,7 @@ in {
}; };
swapScript = mkOption { swapScript = mkOption {
type = types.package; type = types.package;
default = pkgs.writeShellScript "awww-swap" '' default = pkgs.writeShellScript "swww-swap" ''
set -euo pipefail set -euo pipefail
file=$(ls ${wallpapersFolder} | ${lib.getExe config.modules.desktop.rofi.package} -dmenu -sep '\n' -i -p "select a wallpaper") file=$(ls ${wallpapersFolder} | ${lib.getExe config.modules.desktop.rofi.package} -dmenu -sep '\n' -i -p "select a wallpaper")
@ -65,9 +65,9 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
hm.home.packages = [ cfg.package ]; hm.home.packages = [ cfg.package ];
hm.systemd.user.services.awww = { hm.systemd.user.services.swww = {
Unit = { Unit = {
Description = "awww, an Answer to your Wayland Wallpaper Woes"; Description = "swww, a Solution to your Wayland Wallpaper Woes";
After = [ "graphical-session-pre.target" ]; After = [ "graphical-session-pre.target" ];
PartOf = [ "graphical-session.target" ]; PartOf = [ "graphical-session.target" ];
}; };
@ -78,7 +78,7 @@ in {
Service = { Service = {
Type = "simple"; Type = "simple";
ExecStart = "${cfg.package}/bin/awww-daemon --no-cache"; ExecStart = "${cfg.package}/bin/swww-daemon --no-cache";
ExecStartPost = "${cfg.setScript}"; ExecStartPost = "${cfg.setScript}";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 5; RestartSec = 5;

2
modules/desktop/themes/catppuccin/default.nix
View file

@ -87,7 +87,7 @@ in {
wob = with colorScheme.palette; { wob = with colorScheme.palette; {
borderColor = "${base04}FF"; borderColor = "${base04}FF";
backgroundColor = "${base01}CC"; backgroundColor = "${base01}66";
barColor = "${base05}FF"; barColor = "${base05}FF";
}; };

3
modules/desktop/themes/default.nix
View file

@ -95,9 +95,6 @@ in {
theme = cfg.gtkTheme; theme = cfg.gtkTheme;
gtk3.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1"; gtk3.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1";
gtk4.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1"; gtk4.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1";
# https://stopthemingmy.app/
# https://tenor.com/view/blah-bla-gif-23055284
gtk4.theme = cfg.gtkTheme;
}; };
hm.qt = { hm.qt = {

7
modules/desktop/vicinae.nix
View file

@ -27,15 +27,10 @@ in {
settings = { settings = {
"$schema" = "https://vicinae.com/schemas/config.json"; "$schema" = "https://vicinae.com/schemas/config.json";
# i disagree with these
telemetry.system_info = false;
providers.core.entrypoints.sponsor.enable = false;
pop_to_root_on_close = true; pop_to_root_on_close = true;
launcher_window = { launcher_window = {
opacity = 0.8; opacity = 0.95;
client_side_decorations.enabled = false; client_side_decorations.enabled = false;
layer_shell = { layer_shell = {

4
modules/desktop/waybar.nix
View file

@ -315,12 +315,12 @@ in {
return-type = "json"; return-type = "json";
}; };
} }
(mkIf config.modules.desktop.awww.enable { (mkIf config.modules.desktop.swww.enable {
"custom/wallpaper" = { "custom/wallpaper" = {
format = ""; format = "";
tooltip = true; tooltip = true;
tooltip-format = "Change wallpaper"; tooltip-format = "Change wallpaper";
on-click = "${config.modules.desktop.awww.swapScript}"; on-click = "${config.modules.desktop.swww.swapScript}";
}; };
}) })
(mkIf config.modules.hardware.rgb.enable { (mkIf config.modules.hardware.rgb.enable {

0
modules/fs/fstrim.nix → modules/hardware/fs/fstrim.nix
View file

0
modules/fs/lvm.nix → modules/hardware/fs/lvm.nix
View file

0
modules/fs/scrub.nix → modules/hardware/fs/scrub.nix
View file

6
modules/nix.nix
View file

@ -30,8 +30,7 @@ in {
"https://wezterm.cachix.org" "https://wezterm.cachix.org"
"https://niri.cachix.org" "https://niri.cachix.org"
"https://vicinae.cachix.org" "https://vicinae.cachix.org"
"https://cache.garnix.io" "https://cache.soopy.moe"
# "https://cache.soopy.moe"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
@ -39,8 +38,7 @@ in {
"wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0=" "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
"niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "cache.soopy.moe-1:0RZVsQeR+GOh0VQI9rvnHz55nVXkFardDqfm4+afjPo="
# "cache.soopy.moe-1:0RZVsQeR+GOh0VQI9rvnHz55nVXkFardDqfm4+afjPo="
]; ];
}; };
}; };

3
modules/software/dev/git.nix
View file

@ -38,8 +38,7 @@ in {
signing = { signing = {
signByDefault = true; signByDefault = true;
format = "openpgp"; key = "DAF5EAF6665839FD";
key = "DAF5EAF6665839FD"; # :tfm_derp:
}; };
ignores = [ ignores = [

30
modules/software/distractions/steam.nix
View file

@ -6,48 +6,40 @@ let
in { in {
options.modules.software.distractions.steam = { options.modules.software.distractions.steam = {
enable = mkEnableOption "Enable Steam, the game distribution software"; enable = mkEnableOption "Enable Steam, the game distribution software";
session = mkEnableOption "Enable a Steam Deck-like session powered by gamescope"; useGamescope = mkEnableOption "Enable Gamescope, a tool to run games in a separate X session";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.steam = { programs.steam = {
enable = true; enable = true;
gamescopeSession.enable = cfg.session;
package = pkgs.steam.override { package = pkgs.steam.override {
# required for programs to run sometimes # required for programs to run sometimes
# see: https://github.com/NixOS/nixpkgs/issues/162562#issuecomment-1229444338 # see: https://github.com/NixOS/nixpkgs/issues/162562#issuecomment-1229444338
extraPkgs = (pkgs: with pkgs; [ extraPkgs = (pkgs: (lib.optional cfg.useGamescope pkgs.gamescope) ++ (with pkgs; [
libXcursor xorg.libXcursor
libXi xorg.libXi
libXinerama xorg.libXinerama
libXScrnSaver xorg.libXScrnSaver
libpng libpng
libpulseaudio libpulseaudio
libvorbis libvorbis
stdenv.cc.cc.lib stdenv.cc.cc.lib
libkrb5 libkrb5
keyutils keyutils
gperftools ]));
]);
extraEnv = {
# https://github.com/gloriouseggroll/proton-ge-custom
PROTON_USE_WAYLAND = "1";
PROTON_USE_WOW64 = "1";
};
}; };
extraCompatPackages = with pkgs; [ proton-ge-bin ]; extraCompatPackages = with pkgs; [ proton-ge-bin ];
protontricks.enable = true; protontricks.enable = true;
# explicitly allow all the ports to open up
localNetworkGameTransfers.openFirewall = true; localNetworkGameTransfers.openFirewall = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
}; };
# enable windows NT sync primitive driver (semaphores, mutexes, etc.) programs.gamescope = {
# improves performance on wine 11+ and proton 11+ enable = cfg.useGamescope;
boot.kernelModules = [ "ntsync" ]; # capSysNice = true; https://github.com/NixOS/nixpkgs/issues/351516
};
user.packages = with pkgs; [ steam-run ]; user.packages = with pkgs; [ steam-run ];
}; };

27
modules/software/editors/vscode.nix
View file

@ -39,6 +39,24 @@ in {
sumneko.lua sumneko.lua
# wgsl # wgsl
wgsl-analyzer.wgsl-analyzer wgsl-analyzer.wgsl-analyzer
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
# language specific
# qml
{
name = "qt-qml";
publisher = "TheQtCompany";
version = "1.4.0";
sha256 = "sha256-9C0EC4vnulg0OjGNU0SfMA2R6+OaHVCqDsipY2TAqxo=";
}
# libraries
# qt core
{
name = "qt-core";
publisher = "TheQtCompany";
version = "1.4.0";
sha256 = "sha256-QiZc6WNh4Q67beyFuiSqkG5G4zRMNmyjuZhWW7ZATO0=";
}
]; ];
userSettings = with config.modules.desktop.fonts.fonts; { userSettings = with config.modules.desktop.fonts.fonts; {
@ -63,7 +81,12 @@ in {
"nix.enableLanguageServer" = true; "nix.enableLanguageServer" = true;
"nix.serverPath" = "${lib.getExe pkgs.nil}"; "nix.serverPath" = "${lib.getExe pkgs.nil}";
"security.workspace.trust.enabled" = false; "qt-qml.qmlls.enabled" = true;
"qt-qml.qmlls.customExePath" = "${pkgs.qt6.qtdeclarative}/bin/qmlls";
"qt-qml.qmlls.useQmlImportPathEnvVar" = true;
"qt-qml.doNotAskForQmllsDownload" = true;
"security.workspace.trust.enabled" = "false";
"explorer.compactFolders" = false; "explorer.compactFolders" = false;
"explorer.confirmDelete" = false; "explorer.confirmDelete" = false;
@ -77,8 +100,6 @@ in {
# prevent vscode from modifying the terminal colors # prevent vscode from modifying the terminal colors
"terminal.integrated.minimumContrastRatio" = 1; "terminal.integrated.minimumContrastRatio" = 1;
# prevent vscode from messing up font spacing
"terminal.integrated.letterSpacing" = 1;
}; };
}; };
}; };

3
modules/software/system/zswap.nix
View file

@ -2,7 +2,6 @@
with lib; with lib;
let let
# TODO: move this dawg
cfg = config.modules.software.system.zswap; cfg = config.modules.software.system.zswap;
in { in {
options.modules.software.system.zswap = { options.modules.software.system.zswap = {
@ -14,7 +13,7 @@ in {
"zswap.enabled=1" "zswap.enabled=1"
"zswap.shrinker_enabled=1" # high mem: shrink zswap, mv to swap "zswap.shrinker_enabled=1" # high mem: shrink zswap, mv to swap
"zswap.max_pool_percent=20" # TODO: tune this (keep in mind shrinker is enabled) "zswap.max_pool_percent=20" # TODO: tune this (keep in mind shrinker is enabled)
"zswap.compressor=zstd" "zswap.compressor=zstd" # lz4 is missing for some reason
"zswap.zpool=zsmalloc" "zswap.zpool=zsmalloc"
]; ];
}; };

2
modules/xdg.nix
View file

@ -5,7 +5,6 @@
hm.xdg.userDirs = rec { hm.xdg.userDirs = rec {
enable = true; enable = true;
createDirectories = true; createDirectories = true;
setSessionVariables = true;
desktop = "$HOME/desktop"; desktop = "$HOME/desktop";
documents = "$HOME/documents"; documents = "$HOME/documents";
@ -17,7 +16,6 @@
videos = "$HOME/videos"; videos = "$HOME/videos";
extraConfig = { extraConfig = {
recordings = "${videos}/recordings";
screenshots = "${pictures}/screenshots"; screenshots = "${pictures}/screenshots";
}; };
}; };