diff --git a/flake.lock b/flake.lock index 7e316c8..8d6784c 100644 --- a/flake.lock +++ b/flake.lock @@ -115,11 +115,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1782098993, - "narHash": "sha256-VlXIY8Dsr6TWdYFzXxq+HR+xyyv7Ij95QtVwwz+HGdQ=", + "lastModified": 1783625540, + "narHash": "sha256-Cq+jB2th/kxsNDPs5xZcVXIcsJ3/hIZxfyYNRxE8Ixc=", "owner": "emacs-twist", "repo": "emacs-builtins", - "rev": "f4a96d96134d883f977baa3a1060e2a4f1a47966", + "rev": "cfc1c7ffd98e41021ff0dc928c0eb7ca8c1238a9", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "epkgs": { "flake": false, "locked": { - "lastModified": 1782078914, - "narHash": "sha256-fwBls1tq6gIakgXqQM5EixMtuJS+3+QZJBOALEnyXO8=", + "lastModified": 1783877975, + "narHash": "sha256-vrUN9ycv68oh/EpdXMNHfcLldAK0rIWQY0GDlg+ZCA0=", "owner": "emacsmirror", "repo": "epkgs", - "rev": "d27b36f81d3cf0c8e42f2d63761a37fb2df19176", + "rev": "8cf635d43ca0cbc1428be60b8e21d2d61986b152", "type": "github" }, "original": { @@ -202,11 +202,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -220,11 +220,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -340,11 +340,11 @@ "gnu-elpa": { "flake": false, "locked": { - "lastModified": 1781293922, - "narHash": "sha256-nhrJP0zu1yuNgATAvjFqqIGRNqX4UHDtoG5qcwg+YyQ=", + "lastModified": 1782568193, + "narHash": "sha256-xmX4v8LmAU6v0cbNx/oA8bci17JCtEreUCMWuJAFxK8=", "ref": "main", - "rev": "f88cdce39b6e4162059bf39af4319c2956e48ca2", - "revCount": 758, + "rev": "fcf738c3547216d700e1f67a2e1830ed2acba981", + "revCount": 761, "type": "git", "url": "https://git.savannah.gnu.org/git/emacs/elpa.git" }, @@ -361,11 +361,11 @@ ] }, "locked": { - "lastModified": 1782220169, - "narHash": "sha256-NxykfEdGQjop9m49Bk61pXpAduH8ICHgXC1N3Ph3Jp0=", + "lastModified": 1783823409, + "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", "owner": "nix-community", "repo": "home-manager", - "rev": "4b0b9474749820afac53ea30d4ccfef60aba5ce6", + "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", "type": "github" }, "original": { @@ -380,11 +380,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1782051522, - "narHash": "sha256-45VZixBM3606DSmvus47JZYr8Aq3LkSDYan4sqi7KBc=", + "lastModified": 1783862842, + "narHash": "sha256-ce7YKXi5QtoadOPoWt+nWzxo/+a+OxXuVnzVozKO+Z8=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "89fd755403086a06198fc77a3fd993b7f4ab3ea8", + "rev": "5d5d26bea1c99929d6d99c9b9ad08813266f770f", "type": "github" }, "original": { @@ -396,11 +396,11 @@ "melpa": { "flake": false, "locked": { - "lastModified": 1782081335, - "narHash": "sha256-V+kx0DI9l0CnrhdwU9IDFFkrjbh/tNAWFmHeLnXcS6I=", + "lastModified": 1783879082, + "narHash": "sha256-WlKaXhzkUWh9gsokAQgIVb3gIMDx+SNvk0eMFoEtzSc=", "owner": "melpa", "repo": "melpa", - "rev": "94c60de3a59fb002f2c1e8bbf7996079feba2d38", + "rev": "5cdf39f996aedcb54ca024b0c62bca0ecb1f8669", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1781795508, - "narHash": "sha256-VKrApQ3WCkEe9D8DbaeFjGqLAh7zqYGYjbQYtY5ikxc=", + "lastModified": 1783835967, + "narHash": "sha256-lbAgaLDBemsTac7H1HlABcaSKA9xCK5SBzYpEaklY4E=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "493ce1e33e72f86312584f331c8cf52b3432ec99", + "rev": "3374954b30e9e00637517f973a72ca928384b5f0", "type": "github" }, "original": { @@ -452,11 +452,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1781781064, - "narHash": "sha256-Ii/koEm/sRyg65qbAQWqEgboSEIhdH0EL4KglAc14p0=", + "lastModified": 1783522755, + "narHash": "sha256-dI0HkX1djETia7cD/Y64h8BNIsSOfTRMzfNum2J6UhE=", "owner": "YaLTeR", "repo": "niri", - "rev": "49fc6117fd6c043adaa2ead316b82db5ed735d36", + "rev": "0777769e719b7c9b7c980d4ea66288bfbb4da5b3", "type": "github" }, "original": { @@ -467,11 +467,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782175435, - "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", + "lastModified": 1783816212, + "narHash": "sha256-2aZisVTVGSFEk3MYcOiWQp3zvwyzbqpktB69Rcfp150=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", + "rev": "3b32825de172d0bc85664f495edb096b10862524", "type": "github" }, "original": { @@ -483,11 +483,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -498,11 +498,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -513,11 +513,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1782010777, - "narHash": "sha256-s4FQtsk7FyKMG9GshEPqEu+y5xjMWtVSIYe5+ReKw+o=", + "lastModified": 1783821755, + "narHash": "sha256-eMPX9S6MKPyUnaOgeRfrG7OKUiAlc1AlcRinMbSB0WA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2b737a461ddaf811dd6f684701d53da3f7c4ff5c", + "rev": "228ab8523d81526e57a6ca342e1a919fb6d246a8", "type": "github" }, "original": { @@ -528,11 +528,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1781509190, - "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", + "lastModified": 1782847189, + "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", + "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", "type": "github" }, "original": { @@ -544,11 +544,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1781509190, - "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", + "lastModified": 1782847189, + "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", + "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", "type": "github" }, "original": { @@ -565,11 +565,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1782148611, - "narHash": "sha256-9K37YxSnN2wT/HJbUwON9vKPyv9UkBBboNYNbiYm/Xw=", + "lastModified": 1783864549, + "narHash": "sha256-vF2WJV1mk+CnCBPYhKqmICVXDsd91pyAlRK7/L7rWf0=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "733f8c91858b78db4d4a3bed1816b5440fb097cc", + "rev": "430870e0acf64852270ac9baf4db6f876816e468", "type": "github" }, "original": { @@ -580,11 +580,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -596,11 +596,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -630,55 +630,30 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "noctalia-qs": [ - "noctalia-qs" ] }, "locked": { - "lastModified": 1780673010, - "narHash": "sha256-h7Q8F019PwjIqm5lH0kJRQ/58UiELG+XwZ2B62K3PKA=", + "lastModified": 1783880937, + "narHash": "sha256-SLpEXBMj0/cASkfmyluLICGTHWukVPI63u7meMpRCOM=", "owner": "noctalia-dev", - "repo": "noctalia-shell", - "rev": "2461f871a602f9a5688b5b01dc19c6309dd0d519", + "repo": "noctalia", + "rev": "433a1962975a83348fd744ee66b9adb3993d28f5", "type": "github" }, "original": { "owner": "noctalia-dev", - "repo": "noctalia-shell", - "type": "github" - } - }, - "noctalia-qs": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1780194487, - "narHash": "sha256-M+YtjKCTkHrkplNaKVyaxfa8hAWjRF6wFOUBAZvxQ4U=", - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "rev": "07398e12b54f194e3a2d47c87e3fd10b8eeaa27d", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia-qs", + "repo": "noctalia", "type": "github" } }, "nongnu": { "flake": false, "locked": { - "lastModified": 1780978367, - "narHash": "sha256-LIUL6R+/HY+TV3g3kak5XCktLm4ejkie3vC/Z/AG+Ts=", + "lastModified": 1782554643, + "narHash": "sha256-4cTfnlfiz8O0ii0GWdHVqw1bJUreeCZY/eVhhq3PQGY=", "ref": "main", - "rev": "3253fbf43762ee4310b414aa45473898b814762f", - "revCount": 403, + "rev": "2e12d173f9e329f1a37c07a4a84fdbaaff12d245", + "revCount": 404, "type": "git", "url": "https://git.savannah.gnu.org/git/emacs/nongnu.git" }, @@ -727,7 +702,6 @@ "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-wayland": "nixpkgs-wayland", "noctalia": "noctalia", - "noctalia-qs": "noctalia-qs", "nongnu": "nongnu", "rust-overlay": "rust-overlay", "stylix": "stylix", @@ -758,11 +732,11 @@ ] }, "locked": { - "lastModified": 1782184651, - "narHash": "sha256-4XHdXp3MRa++XiGkltJChCtdbCmSlNTwQRfWQOhqbRw=", + "lastModified": 1783834461, + "narHash": "sha256-FCmrs1StAghJDKfqy56KM96KZtxpYzgeq6zM3QO8wjA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f59bc28dd0b89e9c0240d1b80195559fc79c2471", + "rev": "a286e5b998e852297a403786f063fb2c9fe7f57a", "type": "github" }, "original": { @@ -784,18 +758,18 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_3", + "systems": "systems_2", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1781997134, - "narHash": "sha256-muBZG4O/agq/ljgHr6c3AsobIWgODAS6vf50xIS7o+Q=", + "lastModified": 1783358511, + "narHash": "sha256-/F85cBWvU8b2hpawuCog464065ZTJtdMgVPWwJ9yHjE=", "owner": "danth", "repo": "stylix", - "rev": "a6a493119e492e15874caf6f7f8c7e572e64c655", + "rev": "14814ef555d8148ab82eba5054e654cd9eae3a1f", "type": "github" }, "original": { @@ -820,21 +794,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -913,37 +872,16 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "noctalia-qs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "twist": { "inputs": { "elisp-helpers": "elisp-helpers" }, "locked": { - "lastModified": 1782099003, - "narHash": "sha256-1mAGjPpNRB6ML920sBID1faXvJaRWwyEZ+MWBYBQBVI=", + "lastModified": 1782962225, + "narHash": "sha256-0ehUDDBy44dos6Heq1LatRdD/SM7YMDR3ApbWPGNnYk=", "owner": "emacs-twist", "repo": "twist.nix", - "rev": "37c343a92e4fc4c7890733f76f1720fce0eb9e48", + "rev": "267604e48a8a8d528d05682073307c8369eb8a29", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 426fba2..549adb0 100644 --- a/flake.nix +++ b/flake.nix @@ -37,12 +37,7 @@ }; }; noctalia = { - url = "github:noctalia-dev/noctalia-shell"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.noctalia-qs.follows = "noctalia-qs"; - }; - noctalia-qs = { - url = "github:noctalia-dev/noctalia-qs"; + url = "github:noctalia-dev/noctalia"; inputs.nixpkgs.follows = "nixpkgs"; }; alejandra = { @@ -60,6 +55,7 @@ "https://nix-community.cachix.org" "https://cache.garnix.io" "https://niri.cachix.org" + "https://noctalia.cachix.org" ]; extra-trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" @@ -67,6 +63,7 @@ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" + "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4=" ]; }; diff --git a/modules/home/profiles/desktop/default.nix b/modules/home/profiles/desktop/default.nix index 246a0ea..cb44faf 100644 --- a/modules/home/profiles/desktop/default.nix +++ b/modules/home/profiles/desktop/default.nix @@ -51,6 +51,7 @@ in { equibop.enable = true; foot.enable = true; }; + home.pointerCursor.enable = true; # gtk.gtk4.theme = lib.mkForce null; stylix = { enable = true; diff --git a/modules/home/profiles/desktop/niri.nix b/modules/home/profiles/desktop/niri.nix index 25aa9c5..73be4fc 100644 --- a/modules/home/profiles/desktop/niri.nix +++ b/modules/home/profiles/desktop/niri.nix @@ -75,6 +75,7 @@ in programs.niri.settings = { prefer-no-csd = true; input = { + keyboard.xkb.options = "ctrl:hyper_capscontrol"; focus-follows-mouse = { enable = true; max-scroll-amount = "0%"; @@ -106,7 +107,7 @@ in }; }; spawn-at-startup = [ - {command = ["noctalia-shell"];} + {command = ["noctalia"];} ]; xwayland-satellite.enable = true; xwayland-satellite.path = "${pkgs.xwayland-satellite}/bin/xwayland-satellite"; @@ -270,84 +271,42 @@ in ]; }; # shell configuration w/ noctalia - stylix.targets.noctalia-shell.enable = true; - programs.noctalia-shell = { + stylix.targets.noctalia.enable = true; + programs.noctalia = { enable = true; settings = { bar = { - density = "default"; - position = "top"; - # floating = true; - # showCapsule = true; - # useSeparateOpacity = true; - # capsuleOpacity = lib.mkForce 1; - # backgroundOpacity = lib.mkForce 0.01; - widgets = { - left = [ - { - id = "Launcher"; - } - { - id = "SystemMonitor"; - } - { - id = "MediaMini"; - useFixedWidth = false; - maxWidth = 400; - } + order = ["main"]; + main = { + position = "top"; + start = [ + "launcher" + "sysmon" + "media" ]; center = [ - { - formatHorizontal = "ddd yyyy-MM-dd HH:mm"; - formatVertical = "HH mm - MMM dd"; - id = "Clock"; - useMonospacedFont = true; - usePrimaryColor = true; - } - { - hideUnoccupied = false; - id = "Workspace"; - } + "clock" + "workspaces" ]; - right = [ - { - id = "Tray"; - #drawerEnabled = false; - } - { - id = "NotificationHistory"; - } - { - alwaysShowPercentage = true; - id = "Battery"; - warningThreshold = 30; - } - { - id = "Volume"; - } - { - id = "Brightness"; - } - { - id = "ControlCenter"; - useDistroLogo = true; - } + end = [ + "tray" + "notifications" + "battery" + "volume" + "brightness" + "control-center" ]; }; }; - general = { - lockOnSuspend = true; - }; - idle = { + idle.behavior.lock = { enabled = true; }; location = { - monthBeforeDay = true; - name = "New Haven, CT"; + address = "New Haven, CT"; }; wallpaper = { enabled = true; - overviewEnabled = true; + default.path = config.stylix.image; }; }; }; diff --git a/modules/nixos/nix.nix b/modules/nixos/nix.nix index 8bb66cf..d062902 100644 --- a/modules/nixos/nix.nix +++ b/modules/nixos/nix.nix @@ -45,7 +45,6 @@ with lib; { }; }; }; - nix = { gc = { automatic = true;