update packages + some tweaks
This commit is contained in:
parent
527378ad95
commit
edfb60dd12
GPG key ID:
DAF5EAF6665839FD
26 changed files with 304 additions and 319 deletions
416
flake.lock
generated
416
flake.lock
generated
|
|
@ -16,16 +16,71 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"catppuccin": {
|
||||
"cachyos-kernel": {
|
||||
"inputs": {
|
||||
"cachyos-kernel": "cachyos-kernel_2",
|
||||
"cachyos-kernel-patches": "cachyos-kernel-patches",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765485905,
|
||||
"narHash": "sha256-fk6zFzzcwz6su99K7UTxS2497+z/Cdk3FzNsacsmZKA=",
|
||||
"lastModified": 1776386586,
|
||||
"narHash": "sha256-eVAUaL/6n8mnmBiPpEVW1NDNVSKLWhYVfycG+P0SvWU=",
|
||||
"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",
|
||||
"repo": "nix",
|
||||
"rev": "b49c675acd80931fc8b54290920a90189b461dcf",
|
||||
"rev": "bdf0285dc7978ebd78b76054631d7ef05680895e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -34,14 +89,64 @@
|
|||
"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": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1730302879,
|
||||
"narHash": "sha256-XpItMGsYq4XvLT+7OJ9YRILfd/9RG1GMuO6J4hSGepg=",
|
||||
"lastModified": 1771578346,
|
||||
"narHash": "sha256-+/7lxQTRDZ0m+GAAFIjvFt8EXDeqZUtv0pLnNgaauZw=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "fuzzel",
|
||||
"rev": "0af0e26901b60ada4b20522df739f032797b07c3",
|
||||
"rev": "879879da8a7dc58f173b4cd7987723fd19bef6d5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -52,11 +157,11 @@
|
|||
},
|
||||
"hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1764440730,
|
||||
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
|
||||
"lastModified": 1775490113,
|
||||
"narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
|
||||
"rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -72,11 +177,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765682243,
|
||||
"narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
|
||||
"lastModified": 1776454077,
|
||||
"narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
|
||||
"rev": "565e5349208fe7d0831ef959103c9bafbeac0681",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -101,11 +206,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763733840,
|
||||
"narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=",
|
||||
"lastModified": 1772461523,
|
||||
"narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprgraphics",
|
||||
"rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a",
|
||||
"rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -114,84 +219,7 @@
|
|||
"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": {
|
||||
"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": {
|
||||
"hyprutils": [
|
||||
"hyprlock",
|
||||
|
|
@ -207,11 +235,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764612430,
|
||||
"narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
|
||||
"lastModified": 1772459629,
|
||||
"narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "0d00dc118981531aa731150b6ea551ef037acddd",
|
||||
"rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -223,20 +251,20 @@
|
|||
"hyprlock": {
|
||||
"inputs": {
|
||||
"hyprgraphics": "hyprgraphics",
|
||||
"hyprlang": "hyprlang_2",
|
||||
"hyprutils": "hyprutils_2",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner_2",
|
||||
"hyprlang": "hyprlang",
|
||||
"hyprutils": "hyprutils",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_2"
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765358139,
|
||||
"narHash": "sha256-1hIq5gSfV0xc7gaBQDVk3XPv47vjhlc8qbAskOqT4b0=",
|
||||
"lastModified": 1776434938,
|
||||
"narHash": "sha256-D2h3Q8owYExKK03bEgZBJzO9AfahvFMEX+poKoHLIpM=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlock",
|
||||
"rev": "e2da7c6b1fceee9358229a3b5ca48127cd2c427c",
|
||||
"rev": "64ad702b26646e20019e6d05d7b35d0781d5db83",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -246,31 +274,6 @@
|
|||
}
|
||||
},
|
||||
"hyprutils": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hypridle",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hypridle",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749135356,
|
||||
"narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprutils_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprlock",
|
||||
|
|
@ -282,11 +285,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764962281,
|
||||
"narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=",
|
||||
"lastModified": 1772459870,
|
||||
"narHash": "sha256-xxkK2Cvqxpf/4UGcJ/TyCwrvmiNWsKsJfFzHMp2bxis=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0",
|
||||
"rev": "e63f3a79334dec49f8eb1691f66f18115df04085",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -296,31 +299,6 @@
|
|||
}
|
||||
},
|
||||
"hyprwayland-scanner": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hypridle",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hypridle",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749145760,
|
||||
"narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprwayland-scanner_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprlock",
|
||||
|
|
@ -332,11 +310,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763640274,
|
||||
"narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
|
||||
"lastModified": 1772459835,
|
||||
"narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
|
||||
"rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -355,15 +333,16 @@
|
|||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765714461,
|
||||
"narHash": "sha256-P9kQIIPSCqmKyHD/9wFZ4ezlqofnAzYBmolSF1f5xog=",
|
||||
"lastModified": 1776462508,
|
||||
"narHash": "sha256-Hzrtpn7gUP6Xjwl9Lz1+vwxkQYCgKt2o0qLc6u4eLYY=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "ded1462ebc03ed723f0f9f5514e72469da687817",
|
||||
"rev": "4ffa832159b8f7f3ac8879102011f0a47a8db11e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "sodiboo",
|
||||
"ref": "pull/1731/head",
|
||||
"repo": "niri-flake",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -388,11 +367,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1765687800,
|
||||
"narHash": "sha256-Erk+ypR8N+rCvjMdUB1N/v4jtm4QRH9k7r/9zh2HyC8=",
|
||||
"lastModified": 1776363469,
|
||||
"narHash": "sha256-MH7ieeYawsCAjGkoHFZfUDZXplEOiFgSpx2pGr5RK3c=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "7c0898570ca5bd3f10fbf4cf2f8a00edc48d787b",
|
||||
"rev": "82d4c7569e731379284e0653dcdadb8f17cceec7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -404,7 +383,7 @@
|
|||
"nix-colors": {
|
||||
"inputs": {
|
||||
"base16-schemes": "base16-schemes",
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707825078,
|
||||
|
|
@ -427,11 +406,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765267181,
|
||||
"narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
|
||||
"lastModified": 1775970782,
|
||||
"narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
|
||||
"rev": "bedba5989b04614fc598af9633033b95a937933f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -442,21 +421,36 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1763966396,
|
||||
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
|
||||
"lastModified": 1776311487,
|
||||
"narHash": "sha256-9U8bL9X/0R9cZD3Uc/mN37AWvv5dB4WQqqjLRAxQfas=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
|
||||
"rev": "cc1e0e027707ad53dddae39d3b3e992262c7d8c7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixos-unstable-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"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": {
|
||||
"lastModified": 1697935651,
|
||||
"narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
|
||||
|
|
@ -473,11 +467,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1765608474,
|
||||
"narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
|
||||
"lastModified": 1776221942,
|
||||
"narHash": "sha256-FbQAeVNi7G4v3QCSThrSAAvzQTmrmyDLiHNPvTF2qFM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
|
||||
"rev": "1766437c5509f444c1b15331e82b8b6a9b967000",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -489,11 +483,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1748929857,
|
||||
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
|
||||
"lastModified": 1776169885,
|
||||
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
|
||||
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -505,11 +499,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1765472234,
|
||||
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
|
||||
"lastModified": 1776169885,
|
||||
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
|
||||
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -521,11 +515,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1765472234,
|
||||
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
|
||||
"lastModified": 1776169885,
|
||||
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
|
||||
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -569,18 +563,18 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"cachyos-kernel": "cachyos-kernel",
|
||||
"catppuccin": "catppuccin",
|
||||
"fuzzel-catppuccin": "fuzzel-catppuccin",
|
||||
"hardware": "hardware",
|
||||
"home-manager": "home-manager",
|
||||
"hypridle": "hypridle",
|
||||
"hyprlock": "hyprlock",
|
||||
"niri": "niri",
|
||||
"nix-colors": "nix-colors",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"rofi-catppuccin": "rofi-catppuccin",
|
||||
"systems": "systems_3",
|
||||
"systems": "systems_2",
|
||||
"vicinae": "vicinae",
|
||||
"vicinae-extensions": "vicinae-extensions",
|
||||
"waybar-catppuccin": "waybar-catppuccin"
|
||||
|
|
@ -618,16 +612,16 @@
|
|||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -646,32 +640,17 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"systems": "systems_4"
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774140862,
|
||||
"narHash": "sha256-OQC0RntH2eeSGYGnG5C8kdKxnJIi+KYh7usLMoBVYec=",
|
||||
"lastModified": 1776435302,
|
||||
"narHash": "sha256-MSmlvbsg2kc2DdQGBR+3Shta+Spgi4A2k5tkbTnrro8=",
|
||||
"owner": "vicinaehq",
|
||||
"repo": "vicinae",
|
||||
"rev": "9076d4cba5bcade305b7e78cd68759ad2b34a5a3",
|
||||
"rev": "9fb1f6d2f882ebf36ab19919e99ca36ad7e06c9b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -682,18 +661,19 @@
|
|||
},
|
||||
"vicinae-extensions": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_5",
|
||||
"systems": "systems_4",
|
||||
"vicinae": "vicinae_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773786526,
|
||||
"narHash": "sha256-GVIbXYiA506LV0cEsG1AA4vTwDJq9R6v6lFFs8z7knY=",
|
||||
"lastModified": 1775911073,
|
||||
"narHash": "sha256-Fa5JvMFVwBzbnOjEV2Cer8ak0zF/CDwdHT7+wslL30w=",
|
||||
"owner": "vicinaehq",
|
||||
"repo": "extensions",
|
||||
"rev": "50233dff9dfc70fc6b39c2387687e5661b09f005",
|
||||
"rev": "d12bcb134d45dedad1a28a18e1cd8807353338d0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -763,11 +743,11 @@
|
|||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1765343581,
|
||||
"narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=",
|
||||
"lastModified": 1773622265,
|
||||
"narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95",
|
||||
"rev": "a879e5e0896a326adc79c474bf457b8b99011027",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,9 @@
|
|||
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
niri.url = "github:sodiboo/niri-flake";
|
||||
cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
|
||||
|
||||
niri.url = "github:sodiboo/niri-flake/pull/1731/head";
|
||||
|
||||
vicinae.url = "github:vicinaehq/vicinae";
|
||||
vicinae-extensions.url = "github:vicinaehq/extensions";
|
||||
|
|
@ -22,7 +24,6 @@
|
|||
|
||||
hyprlock.url = "github:hyprwm/hyprlock";
|
||||
hyprlock.inputs.nixpkgs.follows = "nixpkgs";
|
||||
hypridle.url = "github:hyprwm/hypridle";
|
||||
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
|
||||
|
|
@ -58,6 +59,7 @@
|
|||
pkgsFor = eachSystem (system:
|
||||
mkPkgs system nixpkgs [
|
||||
self.overlays.default
|
||||
inputs.cachyos-kernel.overlays.pinned
|
||||
inputs.niri.overlays.niri
|
||||
]
|
||||
);
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
# system
|
||||
btop duf lm_sensors ethtool pciutils usbutils powertop killall
|
||||
# debug
|
||||
strace ltrace lsof helvum
|
||||
strace ltrace lsof crosspipe
|
||||
# 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
|
||||
# compatibility
|
||||
wineWowPackages.waylandFull winetricks
|
||||
wineWow64Packages.waylandFull winetricks
|
||||
# misc
|
||||
bat file which packwiz yt-dlp fastfetch hyfetch trashy wev
|
||||
# games
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
# none yet
|
||||
]);
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
|
||||
boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v3;
|
||||
|
||||
modules = {
|
||||
security.useDoas = true;
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
hyprlock.enable = true;
|
||||
hypridle.enable = true;
|
||||
hypridle.desktop = true;
|
||||
swww.enable = true;
|
||||
awww.enable = true;
|
||||
gnome-keyring.enable = true;
|
||||
mate-polkit.enable = true;
|
||||
dunst.enable = true;
|
||||
|
|
@ -104,7 +104,6 @@
|
|||
distractions.discord.enable = true;
|
||||
distractions.discord.vesktop = true;
|
||||
distractions.steam.enable = true;
|
||||
distractions.steam.useGamescope = true;
|
||||
# tools
|
||||
tools.gpg.enable = true;
|
||||
tools.rbw.enable = true;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,12 @@
|
|||
# better performance than the actual intel driver
|
||||
services.xserver.videoDrivers = [ "modesetting" ];
|
||||
|
||||
hardware.apple-t2.kernelChannel = "stable"; # TODO: latest is EOL? change back to latest when upd
|
||||
# replace basic t2 kernel with cachyos kernel
|
||||
# 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;
|
||||
|
||||
environment.variables = {
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
# system
|
||||
btop duf lm_sensors ethtool pciutils usbutils powertop killall
|
||||
# debug
|
||||
strace ltrace lsof helvum
|
||||
strace ltrace lsof crosspipe
|
||||
# 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
|
||||
# compatibility
|
||||
wineWowPackages.waylandFull winetricks
|
||||
wineWow64Packages.waylandFull winetricks
|
||||
# misc
|
||||
bat file which packwiz yt-dlp fastfetch hyfetch trashy wev
|
||||
# games
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
# accessories
|
||||
hyprlock.enable = true;
|
||||
hypridle.enable = true;
|
||||
swww.enable = true;
|
||||
awww.enable = true;
|
||||
gnome-keyring.enable = true;
|
||||
mate-polkit.enable = true;
|
||||
dunst.enable = true;
|
||||
|
|
@ -98,7 +98,6 @@
|
|||
distractions.discord.enable = true;
|
||||
distractions.discord.vesktop = true;
|
||||
distractions.steam.enable = true;
|
||||
distractions.steam.useGamescope = true;
|
||||
# tools
|
||||
tools.gpg.enable = true;
|
||||
tools.rbw.enable = true;
|
||||
|
|
|
|||
|
|
@ -2,20 +2,20 @@
|
|||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.modules.desktop.swww;
|
||||
cfg = config.modules.desktop.awww;
|
||||
|
||||
# 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 :)
|
||||
wallpapersFolder = "${pkgs.my.wallpapers}/share/backgrounds";
|
||||
lastWallpaper = "$XDG_DATA_HOME/swww-last-wallpaper";
|
||||
lastWallpaperSym = "$XDG_DATA_HOME/swww-last-wallpaper-sym";
|
||||
lastWallpaper = "$XDG_DATA_HOME/awww-last-wallpaper";
|
||||
lastWallpaperSym = "$XDG_DATA_HOME/awww-last-wallpaper-sym";
|
||||
in {
|
||||
options.modules.desktop.swww = {
|
||||
enable = mkEnableOption "Enable swww, a Solution to your Wayland Wallpaper Woes";
|
||||
options.modules.desktop.awww = {
|
||||
enable = mkEnableOption "Enable awww, an Answer to your Wayland Wallpaper Woes";
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.swww;
|
||||
example = "pkgs.swww";
|
||||
default = pkgs.awww;
|
||||
example = "pkgs.awww";
|
||||
};
|
||||
wallpapersFolder = mkOption {
|
||||
type = types.str;
|
||||
|
|
@ -25,16 +25,16 @@ in {
|
|||
lastWallpaper = mkOption {
|
||||
type = types.str;
|
||||
default = lastWallpaper;
|
||||
example = "$XDG_DATA_HOME/swww-last-wallpaper";
|
||||
example = "$XDG_DATA_HOME/awww-last-wallpaper";
|
||||
};
|
||||
lastWallpaperSym = mkOption {
|
||||
type = types.str;
|
||||
default = lastWallpaperSym;
|
||||
example = "$XDG_DATA_HOME/swww-last-wallpaper-sym";
|
||||
example = "$XDG_DATA_HOME/awww-last-wallpaper-sym";
|
||||
};
|
||||
setScript = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.writeShellScript "swww-set" ''
|
||||
default = pkgs.writeShellScript "awww-set" ''
|
||||
set -euo pipefail
|
||||
|
||||
if [ ! -f "${lastWallpaper}" ]; then
|
||||
|
|
@ -47,7 +47,7 @@ in {
|
|||
};
|
||||
swapScript = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.writeShellScript "swww-swap" ''
|
||||
default = pkgs.writeShellScript "awww-swap" ''
|
||||
set -euo pipefail
|
||||
|
||||
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 {
|
||||
hm.home.packages = [ cfg.package ];
|
||||
hm.systemd.user.services.swww = {
|
||||
hm.systemd.user.services.awww = {
|
||||
Unit = {
|
||||
Description = "swww, a Solution to your Wayland Wallpaper Woes";
|
||||
Description = "awww, an Answer to your Wayland Wallpaper Woes";
|
||||
After = [ "graphical-session-pre.target" ];
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
};
|
||||
|
|
@ -78,7 +78,7 @@ in {
|
|||
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStart = "${cfg.package}/bin/swww-daemon --no-cache";
|
||||
ExecStart = "${cfg.package}/bin/awww-daemon --no-cache";
|
||||
ExecStartPost = "${cfg.setScript}";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
|
|
@ -16,9 +16,6 @@ in {
|
|||
modules.desktop.fonts.enable = true;
|
||||
modules.desktop.fonts.baseFonts = 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;
|
||||
|
||||
# mounting, trash, and mtp support
|
||||
|
|
|
|||
|
|
@ -20,36 +20,25 @@ in {
|
|||
frame_color = "#${base02}";
|
||||
|
||||
origin = "top-right";
|
||||
vertical_alignment = "center";
|
||||
ellipsize = "middle";
|
||||
|
||||
# various non-color theming settings
|
||||
offset = "15x15";
|
||||
padding = 15;
|
||||
horizontal_padding = 15;
|
||||
text_icon_padding = 15;
|
||||
corner_radius = 8;
|
||||
gap_size = 8;
|
||||
gap_size = 0;
|
||||
frame_width = 1;
|
||||
|
||||
icon_position = "left";
|
||||
min_icon_size = 48;
|
||||
max_icon_size = 64;
|
||||
|
||||
progress_bar = true;
|
||||
progress_bar_height = 8;
|
||||
progress_bar_frame_width = 1;
|
||||
progress_bar_min_width = 150;
|
||||
progress_bar_max_width = 300;
|
||||
progress_bar_corner_radius = 8;
|
||||
|
||||
alignment = "left";
|
||||
markup = "full";
|
||||
format = "<b>%a</b>\\n<b>%s</b>\\n%b";
|
||||
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_middle_click = "close_all";
|
||||
|
|
@ -57,16 +46,13 @@ in {
|
|||
|
||||
# sorting and history settings
|
||||
sort = "update";
|
||||
notification_limit = 4;
|
||||
indicate_hidden = "yes";
|
||||
notification_limit = 5;
|
||||
idle_threshold = 120;
|
||||
history_length = 20;
|
||||
show_age_threshold = 60;
|
||||
show_indicators = "yes";
|
||||
sticky_history = "yes";
|
||||
stack_duplicates = true;
|
||||
hide_duplicate_count = false;
|
||||
always_run_script = true;
|
||||
};
|
||||
|
||||
urgency_low = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, config, pkgs, system, inputs , ... }:
|
||||
{ lib, config, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
|
|
@ -8,7 +8,7 @@ in {
|
|||
enable = mkEnableOption "Enable hypridle, a wayland idle daemon";
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = inputs.hypridle.packages.${system}.hypridle;
|
||||
default = pkgs.hypridle;
|
||||
example = "pkgs.hypridle";
|
||||
};
|
||||
desktop = mkEnableOption "Extend screen dimming time and disable sleeping";
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ in {
|
|||
};
|
||||
background = [
|
||||
{
|
||||
path = "${config.modules.desktop.swww.lastWallpaperSym}";
|
||||
path = "${config.modules.desktop.awww.lastWallpaperSym}";
|
||||
color = "rgb(${base00})";
|
||||
blur_passes = 3;
|
||||
blur_size = 6;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ in {
|
|||
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1";
|
||||
ExecStart = "${pkgs.mate-polkit}/libexec/polkit-mate-authentication-agent-1";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -101,6 +101,14 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
blur = {
|
||||
enable = true;
|
||||
passes = 2;
|
||||
offset = 2;
|
||||
noise = 0.04;
|
||||
saturation = 1.5;
|
||||
};
|
||||
|
||||
overview = {
|
||||
backdrop-color = config.modules.desktop.themes.niri.background;
|
||||
workspace-shadow = {
|
||||
|
|
@ -218,14 +226,24 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
# TODO: configure popups
|
||||
window-rules = [
|
||||
{
|
||||
geometry-corner-radius = allCorners 10.0;
|
||||
clip-to-geometry = true;
|
||||
}
|
||||
{
|
||||
matches = [ { app-id = "^org\.wezfurlong\.wezterm$"; } ];
|
||||
shadow.draw-behind-window = false; # transparent bg
|
||||
matches = [
|
||||
{ app-id = "^org\.wezfurlong\.wezterm$"; }
|
||||
];
|
||||
shadow.draw-behind-window = false;
|
||||
background-effect.blur = true;
|
||||
}
|
||||
{
|
||||
matches = [
|
||||
{ is-floating = true; }
|
||||
];
|
||||
background-effect.xray = false;
|
||||
}
|
||||
{
|
||||
matches = [
|
||||
|
|
@ -292,7 +310,6 @@ in {
|
|||
];
|
||||
|
||||
# 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
|
||||
layer-rules = [
|
||||
{
|
||||
|
|
@ -312,6 +329,10 @@ in {
|
|||
{ namespace = "^vicinae$"; }
|
||||
{ namespace = "^wob$"; }
|
||||
];
|
||||
background-effect = {
|
||||
blur = true;
|
||||
xray = false;
|
||||
};
|
||||
shadow = {
|
||||
enable = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,16 +13,11 @@ in {
|
|||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
# TODO: probably should rewrite somehow,,,
|
||||
# this is ugly, but it SOMEHOW WORKS??
|
||||
# kind of beautiful in its own way
|
||||
default_session = let
|
||||
swayConfig = let
|
||||
monitors = config.modules.desktop.monitors;
|
||||
monitorConfig = if monitors.enable && (builtins.length monitors.monitors > 0) then
|
||||
let
|
||||
# TODO: rewrite primary monitor system
|
||||
# it will get repetitive..
|
||||
firstMonitor = builtins.head monitors.monitors;
|
||||
in
|
||||
"output ${firstMonitor.name} scale ${toString firstMonitor.scale}"
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ in {
|
|||
|
||||
wob = with colorScheme.palette; {
|
||||
borderColor = "${base04}FF";
|
||||
backgroundColor = "${base01}66";
|
||||
backgroundColor = "${base01}CC";
|
||||
barColor = "${base05}FF";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -95,6 +95,9 @@ in {
|
|||
theme = cfg.gtkTheme;
|
||||
gtk3.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 = {
|
||||
|
|
|
|||
|
|
@ -27,10 +27,15 @@ in {
|
|||
settings = {
|
||||
"$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;
|
||||
|
||||
launcher_window = {
|
||||
opacity = 0.95;
|
||||
opacity = 0.8;
|
||||
|
||||
client_side_decorations.enabled = false;
|
||||
|
||||
layer_shell = {
|
||||
|
|
|
|||
|
|
@ -315,12 +315,12 @@ in {
|
|||
return-type = "json";
|
||||
};
|
||||
}
|
||||
(mkIf config.modules.desktop.swww.enable {
|
||||
(mkIf config.modules.desktop.awww.enable {
|
||||
"custom/wallpaper" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
tooltip-format = "Change wallpaper";
|
||||
on-click = "${config.modules.desktop.swww.swapScript}";
|
||||
on-click = "${config.modules.desktop.awww.swapScript}";
|
||||
};
|
||||
})
|
||||
(mkIf config.modules.hardware.rgb.enable {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,8 @@ in {
|
|||
"https://wezterm.cachix.org"
|
||||
"https://niri.cachix.org"
|
||||
"https://vicinae.cachix.org"
|
||||
"https://cache.soopy.moe"
|
||||
"https://cache.garnix.io"
|
||||
# "https://cache.soopy.moe"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
|
|
@ -38,7 +39,8 @@ in {
|
|||
"wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
|
||||
"niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
|
||||
"vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc="
|
||||
"cache.soopy.moe-1:0RZVsQeR+GOh0VQI9rvnHz55nVXkFardDqfm4+afjPo="
|
||||
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
|
||||
# "cache.soopy.moe-1:0RZVsQeR+GOh0VQI9rvnHz55nVXkFardDqfm4+afjPo="
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@ in {
|
|||
|
||||
signing = {
|
||||
signByDefault = true;
|
||||
key = "DAF5EAF6665839FD";
|
||||
format = "openpgp";
|
||||
key = "DAF5EAF6665839FD"; # :tfm_derp:
|
||||
};
|
||||
|
||||
ignores = [
|
||||
|
|
|
|||
|
|
@ -6,40 +6,48 @@ let
|
|||
in {
|
||||
options.modules.software.distractions.steam = {
|
||||
enable = mkEnableOption "Enable Steam, the game distribution software";
|
||||
useGamescope = mkEnableOption "Enable Gamescope, a tool to run games in a separate X session";
|
||||
session = mkEnableOption "Enable a Steam Deck-like session powered by gamescope";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
gamescopeSession.enable = cfg.session;
|
||||
package = pkgs.steam.override {
|
||||
# required for programs to run sometimes
|
||||
# see: https://github.com/NixOS/nixpkgs/issues/162562#issuecomment-1229444338
|
||||
extraPkgs = (pkgs: (lib.optional cfg.useGamescope pkgs.gamescope) ++ (with pkgs; [
|
||||
xorg.libXcursor
|
||||
xorg.libXi
|
||||
xorg.libXinerama
|
||||
xorg.libXScrnSaver
|
||||
extraPkgs = (pkgs: with pkgs; [
|
||||
libXcursor
|
||||
libXi
|
||||
libXinerama
|
||||
libXScrnSaver
|
||||
libpng
|
||||
libpulseaudio
|
||||
libvorbis
|
||||
stdenv.cc.cc.lib
|
||||
libkrb5
|
||||
keyutils
|
||||
]));
|
||||
gperftools
|
||||
]);
|
||||
extraEnv = {
|
||||
# https://github.com/gloriouseggroll/proton-ge-custom
|
||||
PROTON_USE_WAYLAND = "1";
|
||||
PROTON_USE_WOW64 = "1";
|
||||
};
|
||||
};
|
||||
|
||||
extraCompatPackages = with pkgs; [ proton-ge-bin ];
|
||||
protontricks.enable = true;
|
||||
|
||||
# explicitly allow all the ports to open up
|
||||
localNetworkGameTransfers.openFirewall = true;
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = true;
|
||||
};
|
||||
|
||||
programs.gamescope = {
|
||||
enable = cfg.useGamescope;
|
||||
# capSysNice = true; https://github.com/NixOS/nixpkgs/issues/351516
|
||||
};
|
||||
# enable windows NT sync primitive driver (semaphores, mutexes, etc.)
|
||||
# improves performance on wine 11+ and proton 11+
|
||||
boot.kernelModules = [ "ntsync" ];
|
||||
|
||||
user.packages = with pkgs; [ steam-run ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -39,24 +39,6 @@ in {
|
|||
sumneko.lua
|
||||
# wgsl
|
||||
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; {
|
||||
|
|
@ -81,12 +63,7 @@ in {
|
|||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = "${lib.getExe pkgs.nil}";
|
||||
|
||||
"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";
|
||||
"security.workspace.trust.enabled" = false;
|
||||
|
||||
"explorer.compactFolders" = false;
|
||||
"explorer.confirmDelete" = false;
|
||||
|
|
@ -100,6 +77,8 @@ in {
|
|||
|
||||
# prevent vscode from modifying the terminal colors
|
||||
"terminal.integrated.minimumContrastRatio" = 1;
|
||||
# prevent vscode from messing up font spacing
|
||||
"terminal.integrated.letterSpacing" = 1;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
with lib;
|
||||
let
|
||||
# TODO: move this dawg
|
||||
cfg = config.modules.software.system.zswap;
|
||||
in {
|
||||
options.modules.software.system.zswap = {
|
||||
|
|
@ -13,7 +14,7 @@ in {
|
|||
"zswap.enabled=1"
|
||||
"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.compressor=zstd" # lz4 is missing for some reason
|
||||
"zswap.compressor=zstd"
|
||||
"zswap.zpool=zsmalloc"
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
hm.xdg.userDirs = rec {
|
||||
enable = true;
|
||||
createDirectories = true;
|
||||
setSessionVariables = true;
|
||||
|
||||
desktop = "$HOME/desktop";
|
||||
documents = "$HOME/documents";
|
||||
|
|
@ -16,6 +17,7 @@
|
|||
videos = "$HOME/videos";
|
||||
|
||||
extraConfig = {
|
||||
recordings = "${videos}/recordings";
|
||||
screenshots = "${pictures}/screenshots";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue