From 1ea696f57e3861bbe721107c63e8cc8cf4070f57 Mon Sep 17 00:00:00 2001 From: LordGrimmauld Date: Mon, 18 Mar 2024 00:40:44 +0100 Subject: [PATCH] move sway to shared config --- configuration.nix | 10 +++++++ flake.lock | 69 +++++++++++------------------------------------ flake.nix | 24 +++-------------- modules/sway.nix | 67 --------------------------------------------- 4 files changed, 29 insertions(+), 141 deletions(-) delete mode 100644 modules/sway.nix diff --git a/configuration.nix b/configuration.nix index 2825678..3a28046 100644 --- a/configuration.nix +++ b/configuration.nix @@ -54,6 +54,16 @@ "{1526fba1-ac33-4dfc-99d8-163e6129f7b9}" = "reveye-ris"; }; }; + sway = { + enable = true; + populateDefaultConfig = true; + }; + }; + + qt = { + enable = true; + style = "breeze"; + platformTheme = "kde"; }; age.identityPaths = [ "/home/grimmauld/.ssh/id_rsa" ]; diff --git a/flake.lock b/flake.lock index ef5f61e..d0a65b0 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1710608887, - "narHash": "sha256-zE3+gYT+JpbxA/SBlc8GQ0OBYWwtX0++WpZxEIXUebs=", + "lastModified": 1710717798, + "narHash": "sha256-KrZbpo83wnKbUXy0hnmENJTNy/mOCF3Un+nml67e+dU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "73e16a06baf8a9bb273a131b10b142f620c2b610", + "rev": "cd5052eba475afc01072ebc239896a68edc17f95", "type": "github" }, "original": { @@ -245,22 +245,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -463,11 +447,11 @@ ] }, "locked": { - "lastModified": 1710551318, - "narHash": "sha256-s1fOcZdpMbPOTuyVpzvN8QXdxS/viYjQ6J+hTR8NGys=", + "lastModified": 1710637843, + "narHash": "sha256-NVszlVTM0sEe8yZuOShitwOhNdl2juD7032SQg2dV+U=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "8b46b34b574cd1e6a9a8ded392f5b2f97b1f46a2", + "rev": "da2c09734818d85ef4d112997b5188b62cfdd0fd", "type": "github" }, "original": { @@ -501,11 +485,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { @@ -554,9 +538,7 @@ "agenix": "agenix", "chaotic": "chaotic", "nixpkgs": "nixpkgs", - "shared": "shared", - "swayfx": "swayfx", - "swaymux": "swaymux" + "shared": "shared" } }, "rust-analyzer-src": { @@ -610,14 +592,15 @@ "nixpkgs": [ "nixpkgs" ], + "swaymux": "swaymux", "utils": "utils" }, "locked": { - "lastModified": 1710671776, - "narHash": "sha256-5KBMHAvgbHrBc5rLN+k0JNyQsWIYlsRZNd4bcd8Wj/U=", + "lastModified": 1710718492, + "narHash": "sha256-CZgpU2fSJC0HAp6+pAdmAze28t7E2ch6Q+YnFonADUQ=", "ref": "refs/heads/main", - "rev": "33069a8db636bc2b1bbbbbfe8c9745efedc5fe9e", - "revCount": 30, + "rev": "154b9aa8ec511edf7c3a62c94f5d04f5d070e36e", + "revCount": 31, "type": "git", "url": "https://git.grimmauld.de/Grimmauld/grimm-nix-shared" }, @@ -626,30 +609,10 @@ "url": "https://git.grimmauld.de/Grimmauld/grimm-nix-shared" } }, - "swayfx": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1707986911, - "narHash": "sha256-kRWXQnUkMm5HjlDX9rBq8lowygvbK9+ScAOhiySR3KY=", - "owner": "WillPower3309", - "repo": "swayfx", - "rev": "2bd366f3372d6f94f6633e62b7f7b06fcf316943", - "type": "github" - }, - "original": { - "owner": "WillPower3309", - "repo": "swayfx", - "type": "github" - } - }, "swaymux": { "inputs": { "nixpkgs": [ + "shared", "nixpkgs" ] }, diff --git a/flake.nix b/flake.nix index 17c08f7..09f5624 100644 --- a/flake.nix +++ b/flake.nix @@ -13,44 +13,26 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - swaymux = { - url = "git+https://git.grimmauld.de/Grimmauld/swaymux"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - swayfx = { - url = "github:WillPower3309/swayfx"; - inputs.nixpkgs.follows = "nixpkgs"; - }; shared = { url = "git+https://git.grimmauld.de/Grimmauld/grimm-nix-shared"; +# url = "git+file:///home/grimmauld/shared"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = inputs @ { self, agenix, shared, nixpkgs, chaotic, swayfx, swaymux, ... }: let + outputs = inputs @ { self, agenix, shared, nixpkgs, chaotic, ... }: let system = "x86_64-linux"; - - # pkg-overlays = import nixpkgs { - # inherit system; - # config.allowUnfree = true; - # overlays = [self.overlays.default]; - # }; in { - # overlays.default = import ./overlay.nix {inherit inputs system;}; - nixosConfigurations = { grimmauld-nixos = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit inputs system; }; modules = [ - # ({ config, pkgs, ... }: { nixpkgs.overlays = [ (import ./overlay.nix {inherit inputs system;} ) ]; }) - agenix.nixosModules.default + agenix.nixosModules.default chaotic.nixosModules.default shared.nixosModules.default - # swaymux.nixosModules.default # ./kernel.nix ./configuration.nix - ./modules/sway.nix ./modules/users.nix ./modules/tlp.nix ./modules/fonts.nix diff --git a/modules/sway.nix b/modules/sway.nix deleted file mode 100644 index 35737d6..0000000 --- a/modules/sway.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ config, lib, pkgs, modulesPath, inputs, system, ... }: - -{ -# nixpkgs.overlays = [ (final: prev: { sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: { -# src = pkgs.fetchFromGitHub { -# owner = "WillPower3309"; -# repo = "swayfx"; -# rev = "7c75b21933215348f28a2c788b174901ef13e267"; -# sha256 = "sha256-SlfJ34TR+QdFPnTpyo/UON9RDxS3MfLU9tOabWHkknQ="; -# }; -# patches = -# let -# removePatches = [ -# "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch" -# ]; -# in -# builtins.filter -# (patch: !builtins.elem (patch.name or null) removePatches) -# (old.patches or [ ]); -# -# });}) -# ]; - - environment.systemPackages = [ - pkgs.kdePackages.breeze - inputs.swaymux.packages."${system}".default - ]; - - qt = { - enable = true; - style = "breeze"; - platformTheme = "kde"; - }; - - programs.sway = { - enable = true; - wrapperFeatures = { - gtk = true; - base = true; - }; - - extraPackages = with pkgs; [ - swaylock - swayidle - wl-clipboard - wf-recorder - waybar - dmenu - wmenu - grim - slurp - wofi - ]; - extraOptions = [ - "--unsupported-gpu" - ]; - extraSessionCommands = '' - export XDG_CURRENT_DESKTOP=sway - export SDL_VIDEODRIVER=wayland - export QT_QPA_PLATFORM=wayland - export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" - export _JAVA_AWT_WM_NONREPARENTING=1 - export MOZ_ENABLE_WAYLAND=1 -# export MESA_LOADER_DRIVER_OVERRIDE="zink" - ''; - }; -}