From 467e1a69c98e30d77a09fcce53e4af603ce18136 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 2 Oct 2024 12:55:41 -0400 Subject: [PATCH] adding sway i think --- flake.lock | 211 ++++++++++++++++++++++++++++++++- flake.nix | 3 +- home/home.nix | 20 +++- system/eddie/configuration.nix | 13 -- 4 files changed, 230 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 65f322e..40e0e71 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,60 @@ { "nodes": { + "flake-compat": { + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -45,6 +100,25 @@ "url": "https://github.com/kmonad/kmonad?dir=nix" } }, + "lib-aggregate": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1727710043, + "narHash": "sha256-NpTnTg8oOVvntlTi/t8BUe5msrMmkiZFiOW22fc7B+g=", + "owner": "nix-community", + "repo": "lib-aggregate", + "rev": "d03a5f88a345d26ca13918071d42dcc960233183", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lib-aggregate", + "type": "github" + } + }, "musnix": { "inputs": { "nixpkgs": [ @@ -65,6 +139,27 @@ "type": "github" } }, + "nix-eval-jobs": { + "inputs": { + "flake-parts": "flake-parts", + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1726859423, + "narHash": "sha256-7H4u29z/Qwi/KsXS3ucrvXr/gx2fqT48i8EpKMBpMvs=", + "owner": "nix-community", + "repo": "nix-eval-jobs", + "rev": "6684d2074e3cde8a180ef87fac284d6f02ac16d0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-eval-jobs", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1721549352, @@ -80,6 +175,28 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720066371, + "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1727665282, @@ -112,6 +229,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1727571693, + "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1727672256, @@ -128,6 +260,45 @@ "type": "github" } }, + "nixpkgs-wayland": { + "inputs": { + "flake-compat": "flake-compat", + "lib-aggregate": "lib-aggregate", + "nix-eval-jobs": "nix-eval-jobs", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727812556, + "narHash": "sha256-U9cEs2W0eLvIS0kEMBGP8eZMdrpoHqynByth/mu2Nvc=", + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "rev": "a40e6b047b6166aed5fab801e99a8d6b980d4680", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", @@ -136,7 +307,45 @@ "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-wayland": "nixpkgs-wayland" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs-wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723303070, + "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "14c092e0326de759e16b37535161b3cb9770cea3", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index d736577..2e4cc71 100644 --- a/flake.nix +++ b/flake.nix @@ -30,10 +30,11 @@ }; outputs = inputs @ {self, nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, ... }: { + nixpkgs.overlays = [ inputs.nixpkgs-wayland.overlay ]; + nixosConfigurations = { eddie = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - nixpkgs.overlays = [ inputs.nixpkgs-wayland.overlay ]; modules = [ nix-flatpak.nixosModules.nix-flatpak kmonad.nixosModules.default diff --git a/home/home.nix b/home/home.nix index 0ec605e..2c1695b 100644 --- a/home/home.nix +++ b/home/home.nix @@ -81,11 +81,10 @@ tailscale protonplus - solaar - logitech-udev-rules gnomeExtensions.just-perfection gnomeExtensions.dash-to-dock gnomeExtensions.solaar-extension + gnomeExtensions.gpu-profile-selector gnome-software gnome-tweaks gnome-photos @@ -96,6 +95,7 @@ whitesur-icon-theme graphite-gtk-theme graphite-cursors + papers newsflash planify @@ -109,6 +109,9 @@ spice-protocol virt-viewer + solaar + logitech-udev-rules + impression zoom-us nyxt @@ -237,6 +240,19 @@ }; pandoc.enable = true; password-store.enable = true; + waybar.enable = true; + }; + + wayland.windowManager.sway = { + enable = true; + systemd = { + enable = true; + }; + wrapperFeatures = { + gtk = true; + }; + # config = rec { + # }; }; dconf.settings = { diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index c049829..fb66d9a 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -114,19 +114,6 @@ # Enable the X11 windowing system services.xserver.enable = true; - #services.greetd = { - # enable = true; - # settings = rec { - # initial_session = { - # command = "${pkgs.greetd.tuigreet}/bin/tuigreet --sessions ${config.services.xserver.displayManager.sessionData.desktops}/share/xsessions:${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session"; - # user = "greeter"; - # }; - # default_session = initial_session; - # }; - #}; - - #security.pam.services.greetd.enableGnomeKeyring = true; - # Enable the GNOME Desktop Environment. services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true;