From 3194941f93f9e814b5e233ff20c59635bda2fb51 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 11 Jun 2025 18:55:27 -0500 Subject: [PATCH] Fix jude --- flake.lock | 62 +++++++++---------- home/hosts/jude/default.nix | 1 - hosts/jude/default.nix | 37 ++++++++---- modules/hm/default.nix | 1 - modules/hm/sway.nix | 115 ------------------------------------ modules/nixos/default.nix | 1 - modules/nixos/gnome.nix | 6 +- modules/nixos/kde.nix | 8 +-- modules/nixos/sway.nix | 44 -------------- 9 files changed, 62 insertions(+), 213 deletions(-) delete mode 100644 modules/hm/sway.nix delete mode 100644 modules/nixos/sway.nix diff --git a/flake.lock b/flake.lock index 58b8dae..4ff927e 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1748187031, - "narHash": "sha256-F4zdOfeg0xjEnvFjlHvoMmdmh/FxK1qIsZyscnGDgA0=", + "lastModified": 1749652690, + "narHash": "sha256-qLwBEXlGY2pLNPhPNpeOE0DNC1luovTYE3ZDPMyMPXc=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "a06d1d8118865af14a9187e7d1a7a141dd89af74", + "rev": "ac1344fb6d91e2af219803eaaa67d1d974666156", "type": "github" }, "original": { @@ -187,11 +187,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1749526396, - "narHash": "sha256-UL9F76abAk87llXOrcQRjhd5OaOclUd6MIltsqcUZmo=", + "lastModified": 1749657191, + "narHash": "sha256-QLilaHuhGxiwhgceDWESj9gFcKIdEp7+9lRqNGpN8S4=", "owner": "nix-community", "repo": "home-manager", - "rev": "427c96044f11a5da50faf6adaf38c9fa47e6d044", + "rev": "faeab32528a9360e9577ff4082de2d35c6bbe1ce", "type": "github" }, "original": { @@ -363,11 +363,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -457,16 +457,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748037224, - "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", + "lastModified": 1749494155, + "narHash": "sha256-FG4DEYBpROupu758beabUk9lhrblSf5hnv84v1TLqMc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", + "rev": "88331c17ba434359491e8d5889cce872464052c2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -518,11 +518,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "lastModified": 1749558678, + "narHash": "sha256-DUVAe8E2X2QM0dAnTGlTiqemMqUMMyIeCH7UeNo0g64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "rev": "a12f3a99614894502e73eb816e9e076b0ab05730", "type": "github" }, "original": { @@ -621,11 +621,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749496904, - "narHash": "sha256-eNDMzrcDBOprdJs7DpMOJfCEcxribxDJP2OjozSC3Wo=", + "lastModified": 1749644591, + "narHash": "sha256-v72hZJvAA78+LWohTzTwk/OnzsNxbkoTM+G7+iXwdl0=", "owner": "nix-community", "repo": "nixvim", - "rev": "e0b3d8bc3a0ab5a7cc0792c7705e92f9c5c598f3", + "rev": "64f0d3c86a7894cad9b09bb1015375ffb9949d70", "type": "github" }, "original": { @@ -642,11 +642,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1749566933, - "narHash": "sha256-rolwj4dzqfzFMG3VGEN7zKwGTBd0XAKcvOTTEOre3XY=", + "lastModified": 1749670360, + "narHash": "sha256-YmJ5Zffr6tJID0nA3XkQaoeDLFhOZKBtvZl31jXsqQg=", "owner": "nix-community", "repo": "NUR", - "rev": "28532113cfab3f76c3a80f04ef38dca164d7b819", + "rev": "74f88e0178318b15c3c6d8832c681cc4e72c3d92", "type": "github" }, "original": { @@ -665,11 +665,11 @@ ] }, "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", + "lastModified": 1749531675, + "narHash": "sha256-UB8Mc88rW9frjpJ1Fj2ro7f07Gg8dX3uVXvMXnFR4CE=", "owner": "NuschtOS", "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "rev": "4029d450d0266909ee52775849b7da54e79b328e", "type": "github" }, "original": { @@ -869,11 +869,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1749521131, - "narHash": "sha256-ezZ15tLA2L+rmtn39dKLFW/UM2xlksC61V12blulpjE=", + "lastModified": 1749607503, + "narHash": "sha256-ou8BXMfitXrT5dAuxcx3g2kIg3akNe8TdPmxaPlf5UU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "299b2aa650d32310153746135b6a84a6c4de9c21", + "rev": "06a79e7e0edfcbe28b3e60c78d91c9f75998a8f3", "type": "github" }, "original": { diff --git a/home/hosts/jude/default.nix b/home/hosts/jude/default.nix index bdce016..3b6e8c8 100644 --- a/home/hosts/jude/default.nix +++ b/home/hosts/jude/default.nix @@ -4,7 +4,6 @@ greg = { development = true; gui = true; - sway = false; gnome = false; vscodium = true; zed = true; diff --git a/hosts/jude/default.nix b/hosts/jude/default.nix index cef3e40..855ad9f 100644 --- a/hosts/jude/default.nix +++ b/hosts/jude/default.nix @@ -19,7 +19,6 @@ greg = { tailscale.enable = true; - sway.enable = false; gnome.enable = true; kde.enable = false; kubernetes.enable = true; @@ -73,16 +72,34 @@ ]; hardware = { - nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta; - modesetting.enable = true; - powerManagement = { - enable = false; - finegrained = false; + nvidia = + let + gpl_symbols_linux_615_patch = pkgs.fetchpatch { + url = "https://github.com/CachyOS/kernel-patches/raw/914aea4298e3744beddad09f3d2773d71839b182/6.15/misc/nvidia/0003-Workaround-nv_vm_flags_-calling-GPL-only-code.patch"; + hash = "sha256-YOTAvONchPPSVDP9eJ9236pAPtxYK5nAePNtm2dlvb4="; + stripLen = 1; + extraPrefix = "kernel/"; + }; + in + { + #package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta; + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "575.57.08"; + openSha256 = "sha256-DOJw73sjhQoy+5R0GHGnUddE6xaXb/z/Ihq3BKBf+lg="; + sha256_64bit = "sha256-KqcB2sGAp7IKbleMzNkB3tjUTlfWBYDwj50o3R//xvI="; + settingsSha256 = "sha256-AIeeDXFEo9VEKCgXnY3QvrW5iWZeIVg4LBCeRtMs5Io="; + persistencedSha256 = "sha256-Len7Va4HYp5r3wMpAhL4VsPu5S0JOshPFywbO7vYnGo="; + usePersistenced = true; + patches = [ gpl_symbols_linux_615_patch ]; + }; + modesetting.enable = true; + powerManagement = { + enable = false; + finegrained = false; + }; + nvidiaSettings = true; + open = true; }; - nvidiaSettings = true; - open = true; - }; system76 = { firmware-daemon.enable = true; #kernel-modules.enable = true; diff --git a/modules/hm/default.nix b/modules/hm/default.nix index c2b67e8..86ddda1 100644 --- a/modules/hm/default.nix +++ b/modules/hm/default.nix @@ -6,7 +6,6 @@ ./gnome.nix ./gui.nix ./python.nix - ./sway.nix ./vscodium.nix ./xonsh.nix ./zed.nix diff --git a/modules/hm/sway.nix b/modules/hm/sway.nix deleted file mode 100644 index 9a8112a..0000000 --- a/modules/hm/sway.nix +++ /dev/null @@ -1,115 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: - -let - cfg = config.greg.sway; - file_browser = { - pkg = pkgs.krusader; - path = "${pkgs.krusader}/bin/krusader"; - }; - term = "${pkgs.alacritty}/bin/alacritty"; - msg = "${pkgs.sway}/bin/swaymsg"; - sleep = "${pkgs.coreutils}/bin/sleep"; - workstation1 = pkgs.writeScriptBin "workstation1" ( - builtins.concatStringsSep "\n" [ - "${msg} \"workspace 1 ; exec ${pkgs.firefox}/bin/firefox ; split horizontal ; exec ${pkgs.element-desktop}/bin/element-desktop \"" - "${sleep} 1" - "${msg} '[app_id=\"firefox\"]' move left" - "${msg} '[instance=\"element\"]' \"layout tabbed ; exec ${term} \"" - "${msg} '[app_id=\"firefox\"]' move left" - "${sleep} 0.3" - "${msg} '[app_id=\"Alacritty\" workspace=\"1\"]' move right" - "${msg} '[app_id=\"firefox\"]' resize grow width 300 px" - ] - ); - workstation2 = pkgs.writeScriptBin "workstation2" ( - builtins.concatStringsSep "\n" [ - "${sleep} 5" - "${msg} \"workspace 2 ; exec ${term} ; layout tabbed\"" - ] - ); -in -{ - options.greg.sway = lib.mkEnableOption "Enable Sway support and settings"; - - config = ( - lib.mkIf cfg { - programs.swaylock.enable = true; - - wayland.windowManager.sway = - let - mod = config.wayland.windowManager.sway.config.modifier; - in - { - enable = true; - config = rec { - #fonts.size = 10.0; - keybindings = lib.mkOptionDefault { - "Mod4+l" = "exec ${pkgs.swaylock}/bin/swaylock -c 000000"; - "Mod4+h" = "exec ${pkgs.qpwgraph}/bin/qpwgraph -x /home/greg/sound/headphones.qpwgraph -m"; - "Mod4+m" = "exec ${pkgs.qpwgraph}/bin/qpwgraph -x /home/greg/sound/monitor.qpwgraph -m"; - "Mod4+b" = "exec ${pkgs.qpwgraph}/bin/qpwgraph -x /home/greg/sound/both.qpwgraph -m"; - - "${mod}+Shift+Return" = file_browser.path; - }; - modifier = "Mod1"; - output = { - "Samsung Electric Company S24E650 H4ZN600985" = { - mode = "1920x1200"; - transform = "90"; - pos = "0 0"; - }; - "ViewSonic Corporation VA2252 Series VMT201800925" = { - mode = "1920x1080"; - pos = "200 1920"; - }; - }; - terminal = term; - startup = [ - { command = "${workstation1}/bin/workstation1"; } - { command = "${workstation2}/bin/workstation2"; } - ]; - }; - extraOptions = [ "--unsupported-gpu" ]; - extraSessionCommands = '' - export WLR_NO_HARDWARE_CURSORS=1 - ''; - systemd.enable = true; - wrapperFeatures = { - base = true; - gtk = true; - }; - }; - - home.pointerCursor = { - name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; - size = 12; - x11 = { - enable = true; - defaultCursor = "Adwaita"; - }; - }; - - home.packages = with pkgs; [ - arj - dpkg - kate - kget - krename - file_browser.pkg - p7zip - plocate - rpm - qpwgraph - xorg.xev - xorg.xmodmap - xxdiff - ]; - } - ); -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 805ff5b..d1185e0 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -20,7 +20,6 @@ ./remote-builder.nix ./router.nix ./rpi4.nix - ./sway.nix ./syncthing.nix ./tailscale.nix ./vmdev.nix diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix index dd61bcb..209af52 100644 --- a/modules/nixos/gnome.nix +++ b/modules/nixos/gnome.nix @@ -23,10 +23,10 @@ with lib; # Trackpad support libinput.enable = true; + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + xserver = { - enable = true; - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; xkb.layout = "us"; }; diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix index d6f37bd..7fcf7b7 100644 --- a/modules/nixos/kde.nix +++ b/modules/nixos/kde.nix @@ -24,12 +24,6 @@ with lib; systemd.services.bluetooth.requiredBy = [ "multi-user.target" ]; services = { - xserver = { - enable = true; - xkb.layout = "us"; - # Trackpad support - }; - libinput.enable = true; blueman.enable = true; @@ -49,7 +43,7 @@ with lib; }); programs.dconf.enable = true; - programs.sway.enable = true; # Gives us Wayland + xdg.portal = { enable = true; wlr.enable = true; # Enables screen sharing in Wayland diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix deleted file mode 100644 index 6ab8e5d..0000000 --- a/modules/nixos/sway.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ config, lib, ... }: - -let - cfg = config.greg.sway; - -in -with lib; -{ - options = { - greg.sway.enable = mkEnableOption "Enable my default Gnome3 setup"; - }; - - config = mkIf cfg.enable { - services = { - accounts-daemon.enable = true; - - pipewire = { - enable = true; - alsa.enable = true; - audio.enable = true; - jack.enable = true; - pulse.enable = true; - wireplumber.enable = true; - }; - - xserver = { - enable = true; - displayManager.gdm = { - enable = true; - autoSuspend = false; - banner = "Welcome to Greg's JUDE machine. Do I know you?"; - wayland = true; - }; - xkb.layout = "us"; - }; - }; - - programs.sway = { - enable = true; # Will be enabled through home-manager - wrapperFeatures.gtk = true; - }; - security.pam.services.swaylock = { }; - }; -}