diff options
| -rw-r--r-- | common/modules/window_managers/default.nix | 1 | ||||
| -rw-r--r-- | common/modules/window_managers/niri/default.nix | 19 | ||||
| -rw-r--r-- | common/programs/brave.nix | 2 | ||||
| -rw-r--r-- | common/programs/librewolf.nix | 34 | ||||
| -rw-r--r-- | flake.lock | 115 | ||||
| -rw-r--r-- | hosts/common.nix | 2 | ||||
| -rw-r--r-- | hosts/niuwux/default.nix | 16 | ||||
| -rw-r--r-- | users/beeb5k/default.nix | 4 | ||||
| -rw-r--r-- | users/common.nix | 8 |
9 files changed, 118 insertions, 83 deletions
diff --git a/common/modules/window_managers/default.nix b/common/modules/window_managers/default.nix index 547e2c8..9b8f660 100644 --- a/common/modules/window_managers/default.nix +++ b/common/modules/window_managers/default.nix @@ -28,6 +28,7 @@ in mango.enable = lib.mkEnableOption "Enable mangowm"; niri.enable = lib.mkEnableOption "Enable niri"; noctalia = lib.mkEnableOption "Enable noctalia shell"; + xwayland = lib.mkEnableOption "Enable Xwayland support"; beeConfig = { enable = lib.mkEnableOption "Enable stuff from my config"; waybar = lib.mkOption { diff --git a/common/modules/window_managers/niri/default.nix b/common/modules/window_managers/niri/default.nix index d3c1ced..faefe1a 100644 --- a/common/modules/window_managers/niri/default.nix +++ b/common/modules/window_managers/niri/default.nix @@ -19,9 +19,12 @@ in config = lib.mkIf cfg.niri.enable ( if homeManager then { - home.packages = with pkgs; [ - xwayland-satellite - ]; + home.packages = + with pkgs; + lib.optionals cfg.xwayland [ + xwayland-satellite + ]; + xdg.configFile."niri/config.kdl".text = '' include optional=true "./noctalia.kdl" workspace "1" @@ -47,21 +50,11 @@ in // scroll-method "two-finger" // disabled-on-external-mouse } - mouse { - scroll-method "on-button-down" - scroll-button 274 // "middle" is also accepted - - scroll-button-lock - } warp-mouse-to-focus focus-follows-mouse max-scroll-amount="0%" } - clipboard { - disable-primary - } - output "eDP-1" { mode "1920x1080@120.030" scale 1 diff --git a/common/programs/brave.nix b/common/programs/brave.nix index d7240e7..cba3bca 100644 --- a/common/programs/brave.nix +++ b/common/programs/brave.nix @@ -1,7 +1,7 @@ { inputs, pkgs, ... }: { programs.brave = { - enable = true; + enable = false; package = inputs.brave-origin.packages.${pkgs.stdenv.hostPlatform.system}.default; extensions = [ diff --git a/common/programs/librewolf.nix b/common/programs/librewolf.nix index 9238632..f5a6440 100644 --- a/common/programs/librewolf.nix +++ b/common/programs/librewolf.nix @@ -7,7 +7,7 @@ }: { programs.librewolf = { - enable = false; + enable = true; policies = { ExtensionSettings = { # "uBlock0@raymondhill.net" = { @@ -63,22 +63,22 @@ "browser.toolbars.bookmarks.visibility" = "never"; "widget.use-xdg-desktop-portal.file-picker" = 1; }; - userChrome = '' - @import "firefox-gnome-theme/userChrome.css"; - * { - font-family: "monospace" !important; - border-radius: 0px !important; - } - - ''; - userContent = '' - @import "firefox-gnome-theme/userContent.css"; - * { - font-family: "monospace" !important; - border-radius: 0px !important; - } - ''; - + # userChrome = '' + # @import "firefox-gnome-theme/userChrome.css"; + # * { + # font-family: "monospace" !important; + # border-radius: 0px !important; + # } + # + # ''; + # userContent = '' + # @import "firefox-gnome-theme/userContent.css"; + # * { + # font-family: "monospace" !important; + # border-radius: 0px !important; + # } + # ''; + # search = { force = true; engines = { @@ -12,11 +12,11 @@ "wrappers": "wrappers" }, "locked": { - "lastModified": 1781948118, - "narHash": "sha256-iViSJqQARCithdqpfUFL/+02tnG5sC76oozlFnC38wc=", + "lastModified": 1781950583, + "narHash": "sha256-wkhNutjCft4TdxUCwI4bE9zRXKxMECBg/Rrz3Px0GFY=", "ref": "refs/heads/main", - "rev": "4824098ae852102a91592cd2b8cc607905a14cc9", - "revCount": 45, + "rev": "478e2f31aa5945bc39edfc59b3e9f081633dca66", + "revCount": 46, "type": "git", "url": "https://codeberg.org/beeb5k/beeVim" }, @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1781780775, - "narHash": "sha256-6TRfQ2NQzQhzXcxLOyCm1RilutxPt4/TVF77VLIZ0nU=", + "lastModified": 1783759392, + "narHash": "sha256-I2zI2OW8hKD8BVx9DX7quTxWgQhhzAaCF/8JXgUJpHU=", "owner": "Daniel-42-z", "repo": "brave-origin-flake", - "rev": "f8d37802d1088c2ac7beb077bf9f1b3f380f4c9b", + "rev": "1b2fb9bc254e7de179595728bb5f2d621cf1b7b6", "type": "github" }, "original": { @@ -51,11 +51,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": { @@ -69,11 +69,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -100,6 +100,28 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": [ + "mango", + "scenefx", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -107,11 +129,11 @@ ] }, "locked": { - "lastModified": 1781906751, - "narHash": "sha256-6Ld1PqmptFtFKblE+SynhRgyBApUWcmrISetWqWHeeo=", + "lastModified": 1783823409, + "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", "owner": "nix-community", "repo": "home-manager", - "rev": "37f21dfa5d27e71b75bacd9418b156f9265e312e", + "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", "type": "github" }, "original": { @@ -129,11 +151,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1781878235, - "narHash": "sha256-tl7ejLTHpk61643MSATioVdGzPZF4FbgEIqHvTMEtj0=", + "lastModified": 1783828427, + "narHash": "sha256-yYYtJZBUWdZmMQ1knD/avgjJr80G3Tz8zKMMYfxXR7E=", "owner": "mangowm", "repo": "mango", - "rev": "8e356692f6e44f5b6b12f31755ad87fae8c24a68", + "rev": "5aab9f57e5eef00e4251fa1e7afdf87d9b01ee95", "type": "github" }, "original": { @@ -144,11 +166,11 @@ }, "nixpkgs": { "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": { @@ -160,11 +182,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": { @@ -175,11 +197,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -195,11 +217,11 @@ ] }, "locked": { - "lastModified": 1781904023, - "narHash": "sha256-x2Gy2TZV1QZpCRHD7nGpYUPNVyN58ZkQUh6WCIlx10I=", + "lastModified": 1783870718, + "narHash": "sha256-72H4jkm35LOE6XTN75dihEEVytW0uDRKcOUJECq6pZY=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "67a99b5997cde7f64ad53d4f8f92c05ba7c22c67", + "rev": "f29f3c0dd1e70f22c891df474a047c5ddcf1ac69", "type": "github" }, "original": { @@ -286,17 +308,19 @@ }, "scenefx": { "inputs": { + "flake-utils": "flake-utils_2", "nixpkgs": [ "mango", "nixpkgs" - ] + ], + "systems": "systems_2" }, "locked": { - "lastModified": 1750785057, - "narHash": "sha256-tGX6j4W91rcb+glXJo43sjPI9zQvPotonknG1BdihR4=", + "lastModified": 1782624992, + "narHash": "sha256-vUjLG6eubEhJJVa9LPygIcVmNoHwYbSUTJcWEcbxnU4=", "owner": "wlrfx", "repo": "scenefx", - "rev": "3a6cfb12e4ba97b43326357d14f7b3e40897adfc", + "rev": "37ccd723bef49e6891156ffafce8f549f01446cc", "type": "github" }, "original": { @@ -312,11 +336,11 @@ ] }, "locked": { - "lastModified": 1780547341, - "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", + "lastModified": 1783174389, + "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", + "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", "type": "github" }, "original": { @@ -340,6 +364,21 @@ "type": "github" } }, + "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" + } + }, "wrappers": { "inputs": { "nixpkgs": [ diff --git a/hosts/common.nix b/hosts/common.nix index 4ae58aa..9cd4112 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -249,9 +249,9 @@ environment.systemPackages = with pkgs; [ android-tools + scrcpy playerctl pciutils - imagemagick sops fd ripgrep diff --git a/hosts/niuwux/default.nix b/hosts/niuwux/default.nix index 796dc17..7e05c79 100644 --- a/hosts/niuwux/default.nix +++ b/hosts/niuwux/default.nix @@ -76,7 +76,7 @@ # capSysNice = true; }; programs.steam = { - enable = true; + enable = false; protontricks.enable = true; gamescopeSession.enable = false; remotePlay.openFirewall = true; @@ -107,11 +107,15 @@ networking.firewall.enable = true; programs.direnv.enable = true; - environment.systemPackages = with pkgs; [ - vulkan-tools - pciutils - mangohud - ]; + environment.systemPackages = + with pkgs; + [ + vulkan-tools + pciutils + ] + ++ lib.optionals config.programs.steam.enable [ + mangohud + ]; services.xserver.videoDrivers = [ "nvidia" ]; hardware = { diff --git a/users/beeb5k/default.nix b/users/beeb5k/default.nix index aa5dc51..9d5b773 100644 --- a/users/beeb5k/default.nix +++ b/users/beeb5k/default.nix @@ -23,6 +23,7 @@ windowManagers = { mango.enable = false; niri.enable = true; + xwayland = false; eyeCandy.enable = true; eyeCandy = { window = { @@ -39,8 +40,7 @@ }; matugen.enable = true; terminal = { - default = "alacritty"; - alacritty = true; + foot = true; font.family = "monospace"; font.size = 12.0; }; diff --git a/users/common.nix b/users/common.nix index 4a7ea0b..b55c4ea 100644 --- a/users/common.nix +++ b/users/common.nix @@ -71,7 +71,7 @@ in }; qt = { - enable = true; + enable = false; platformTheme.name = "qtct"; }; @@ -133,7 +133,7 @@ in extraConfig = '' include noctaliarc - set recolor true + set recolor false ''; }; @@ -156,11 +156,9 @@ in }; home.packages = with pkgs; [ - swayimg kew imagemagick nautilus - opencode - clang + proton-vpn ]; } |