diff --git a/Kvantum/Base16Kvantum b/Kvantum/Base16Kvantum new file mode 120000 index 0000000..362f343 --- /dev/null +++ b/Kvantum/Base16Kvantum @@ -0,0 +1 @@ +/nix/store/fx1yq3cxgk9bq588csvpl56i4030c6fj-home-manager-files/.config/Kvantum/Base16Kvantum \ No newline at end of file diff --git a/Kvantum/kvantum.kvconfig b/Kvantum/kvantum.kvconfig new file mode 120000 index 0000000..fb1c900 --- /dev/null +++ b/Kvantum/kvantum.kvconfig @@ -0,0 +1 @@ +/nix/store/fx1yq3cxgk9bq588csvpl56i4030c6fj-home-manager-files/.config/Kvantum/kvantum.kvconfig \ No newline at end of file diff --git a/autostart/stylix-activate-gnome.desktop b/autostart/stylix-activate-gnome.desktop index 786e6f4..f66ee09 120000 --- a/autostart/stylix-activate-gnome.desktop +++ b/autostart/stylix-activate-gnome.desktop @@ -1 +1 @@ -/nix/store/2qyj9b0srxijc0spmdragvm2x650aiml-home-manager-files/.config/autostart/stylix-activate-gnome.desktop \ No newline at end of file +/nix/store/fx1yq3cxgk9bq588csvpl56i4030c6fj-home-manager-files/.config/autostart/stylix-activate-gnome.desktop \ No newline at end of file diff --git a/autostart/stylix-activate-kde.desktop b/autostart/stylix-activate-kde.desktop index c952daf..46fb806 120000 --- a/autostart/stylix-activate-kde.desktop +++ b/autostart/stylix-activate-kde.desktop @@ -1 +1 @@ -/nix/store/2qyj9b0srxijc0spmdragvm2x650aiml-home-manager-files/.config/autostart/stylix-activate-kde.desktop \ No newline at end of file +/nix/store/fx1yq3cxgk9bq588csvpl56i4030c6fj-home-manager-files/.config/autostart/stylix-activate-kde.desktop \ No newline at end of file diff --git a/home-manager/flake.lock b/home-manager/flake.lock index a5c10c9..ee723a3 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "advisory-db": { - "flake": false, - "locked": { - "lastModified": 1770535588, - "narHash": "sha256-zi+Ote4H/hbhKoAFpgEqYh04CEoOdgK8LSd53Pt/8AU=", - "owner": "rustsec", - "repo": "advisory-db", - "rev": "1c176c03f6d76499a541a4598932837f9f4642ad", - "type": "github" - }, - "original": { - "owner": "rustsec", - "repo": "advisory-db", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -147,40 +131,6 @@ "type": "github" } }, - "crane": { - "locked": { - "lastModified": 1770419512, - "narHash": "sha256-o8Vcdz6B6bkiGUYkZqFwH3Pv1JwZyXht3dMtS7RchIo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "2510f2cbc3ccd237f700bb213756a8f35c32d8d7", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": "nixpkgs", - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1770534122, - "narHash": "sha256-7pA+q0JjEpECX9aBT4x4b2IRQuGIYKGwksZTuSm2EA8=", - "owner": "nix-community", - "repo": "fenix", - "rev": "0c9a447b32ee7af5cd2ad73aaf1bcfa09287a619", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -329,36 +279,33 @@ }, "niri": { "inputs": { - "advisory-db": "advisory-db", - "crane": "crane", - "fenix": "fenix", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-tracy": "nixpkgs-tracy", - "treefmt-nix": "treefmt-nix" + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1770946924, - "narHash": "sha256-XpZyA6pkdtve0vRpiDiaDkWXavmh6quJ4TAv1w2Ic9s=", - "owner": "Lukrecjaaa", + "lastModified": 1772873838, + "narHash": "sha256-pFh7J2fBqsZvZrD26zfOj30qTM8+7PLZsNSLX+VOcUA=", + "owner": "niri-wm", "repo": "niri", - "rev": "defcdd8c3f4262311b08e7c22c513b15a9965842", + "rev": "5393902dd22e9d540438ee178775f1e488eea724", "type": "github" }, "original": { - "owner": "Lukrecjaaa", + "owner": "niri-wm", + "ref": "wip/branch", "repo": "niri", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -384,54 +331,6 @@ "type": "github" } }, - "nixpkgs-tracy": { - "locked": { - "lastModified": 1769755524, - "narHash": "sha256-WdOgKw0aDi71hrGy7Zi0kTHEIGJFGB2lWBO32rAPgYA=", - "owner": "davidkern", - "repo": "nixpkgs", - "rev": "c15c8f34f27eeece2b38f570f676f3ec62a85122", - "type": "github" - }, - "original": { - "owner": "davidkern", - "ref": "tracy-split-package", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1772773019, - "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -526,32 +425,36 @@ "codex-cli-nix": "codex-cli-nix", "home-manager": "home-manager", "niri": "niri", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "nixpkgs-pre-ad01": "nixpkgs-pre-ad01", "noctalia": "noctalia", "quickshell": "quickshell", - "rust-overlay": "rust-overlay", + "rust-overlay": "rust-overlay_2", "stylix": "stylix" } }, - "rust-analyzer-src": { - "flake": false, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "niri", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1770470239, - "narHash": "sha256-0hooiH069rm+xUwRa20+Cj0mvTN6IQy797f3qPLbjsY=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "fc5544304143d4bfd10fbf8839b1010c15e1491e", + "lastModified": 1757989933, + "narHash": "sha256-9cpKYWWPCFhgwQTww8S94rTXgg8Q8ydFv9fXM6I8xQM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8249aa3442fb9b45e615a35f39eca2fe5510d7c3", "type": "github" }, "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", + "owner": "oxalica", + "repo": "rust-overlay", "type": "github" } }, - "rust-overlay": { + "rust-overlay_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -745,24 +648,6 @@ "repo": "base16-zed", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1770228511, - "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 2f20d5f..ca6cc1a 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -31,7 +31,7 @@ }; niri = { - url = "github:Lukrecjaaa/niri"; + url = "github:niri-wm/niri/wip/branch"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index b88ae21..1f5652c 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -202,14 +202,6 @@ }; }; - qt = { - enable = true; - platformTheme.name = "adwaita"; - style = { - name = "adwaita-dark"; - }; - }; - # Enable and configure git programs.git = { enable = true; @@ -258,7 +250,6 @@ # Use dark mode polarity = "dark"; - # Disable Qt theming (it's janky and doesn't apply everywhere) - # targets.qt.enable = false; + targets.qt.enable = true; }; } diff --git a/niri/config.kdl b/niri/config.kdl index 16aeac5..b975ef1 100644 --- a/niri/config.kdl +++ b/niri/config.kdl @@ -1,9 +1,4 @@ layout { - blur { - noise 0.1 - passes 3 - radius 10 - } gaps 5 background-color "transparent" always-center-single-column @@ -85,34 +80,63 @@ window-rule { } window-rule { match app-id="kitty" - blur { - on + + background-effect { + blur true + noise 0.1 + xray true + } +} +window-rule { + match app-id="kitty" is-floating=true + + background-effect { + blur true + noise 0.1 + xray false } } window-rule { match app-id="code" opacity 0.85 - blur { - on + + background-effect { + blur true + noise 0.1 + xray true + } +} +window-rule { + match app-id="code" is-floating=true + + background-effect { + blur true + noise 0.1 + xray false } } window-rule { match app-id="org.gnome.Nautilus" opacity 0.85 - blur { - on + + background-effect { + blur true + noise 0.1 + xray true + } +} +window-rule { + match app-id="org.gnome.Nautilus" is-floating=true + + background-effect { + blur true + noise 0.1 + xray false } } layer-rule { match namespace="^quickshell-overview$" } -// Disable blur on Noctalia bar and panel surfaces -layer-rule { - match namespace="^noctalia-" - blur { - off - } -} binds { // Core Noctalia binds Mod+Space { diff --git a/noctalia/settings.json b/noctalia/settings.json index fd75ed8..e72601d 100644 --- a/noctalia/settings.json +++ b/noctalia/settings.json @@ -41,18 +41,18 @@ "autoHideDelay": 500, "autoShowDelay": 150, "backgroundOpacity": 0, - "barType": "simple", + "barType": "floating", "capsuleColorKey": "none", "capsuleOpacity": 1, "contentPadding": 2, "density": "default", "displayMode": "always_visible", - "floating": false, + "floating": true, "fontScale": 1, "frameRadius": 12, "frameThickness": 8, "hideOnOverview": false, - "marginHorizontal": 5, + "marginHorizontal": 8, "marginVertical": 5, "middleClickAction": "none", "middleClickCommand": "", @@ -196,10 +196,6 @@ }, "calendar": { "cards": [ - { - "enabled": true, - "id": "timer-card" - }, { "enabled": true, "id": "weather-card" @@ -281,6 +277,11 @@ "enabled": false, "gridSnap": false, "monitorWidgets": [ + { + "name": "eDP-1", + "widgets": [ + ] + } ], "overviewEnabled": true }, @@ -518,28 +519,28 @@ "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "4" + "keybind": "3" }, { "action": "logout", "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "5" + "keybind": "4" }, { "action": "shutdown", "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "6" + "keybind": "5" }, { "action": "hibernate", "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "3" + "keybind": "6" }, { "action": "userspaceReboot", @@ -553,7 +554,7 @@ "command": "", "countdownEnabled": true, "enabled": true, - "keybind": "" + "keybind": "7" } ], "showHeader": true,