From 9692fc7f990f57144951ab4de0c082101a329406 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 9 Oct 2025 09:24:55 -0500 Subject: [PATCH] grrrrrr --- flake.nix | 2 +- home/home.nix | 20 +++++----- home/modules/niri.nix | 4 +- qmk/qmk_firmware | 2 +- scripts/niriemacslof | 3 ++ scripts/nirifflof | 3 ++ systems/nixbook/configuration.nix | 66 +++++++++++-------------------- systems/nixbook/pkgs.nix | 14 ------- 8 files changed, 44 insertions(+), 70 deletions(-) create mode 100644 scripts/niriemacslof create mode 100644 scripts/nirifflof diff --git a/flake.nix b/flake.nix index 4ff4141..ba93d25 100644 --- a/flake.nix +++ b/flake.nix @@ -125,7 +125,7 @@ modules = [ (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") ./systems/nixbook/configuration.nix - nixos-hardware.nixosModules.dell-inspiron-7405 + nixos-hardware.nixosModules.common-cpu-amd ]; }; syl = lib.nixosSystem { diff --git a/home/home.nix b/home/home.nix index 6881303..b5ef3d2 100644 --- a/home/home.nix +++ b/home/home.nix @@ -87,17 +87,17 @@ in { "audio/opus" = "mpv-slow.desktop"; "audio/x-opus" = "mpv-slow.desktop"; "audio/x-opus+ogg" = "mpv-slow.desktop"; - "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; - "text/html" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/http" = "librewolf.desktop"; + "x-scheme-handler/https" = "librewolf.desktop"; + "text/html" = "librewolf.desktop"; "text/org" = "emacsclient.desktop"; "text/md" = "emacsclient.desktop"; "text/txt" = "emacsclient.desktop"; "text/rs" = "emacsclient.desktop"; "text/plain" = "emacsclient.desktop"; "application/pdf" = "okular.desktop"; - "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/about" = "librewolf.desktop"; + "x-scheme-handler/unknown" = "librewolf.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; "application/vnd.openxmlformats-officedocuments.spreadsheetml.sheet" = "libreoffice.desktop"; }; @@ -127,17 +127,17 @@ in { "audio/flac" = "mpv-slow.desktop"; "audio/wav" = "mpv-slow.desktop"; "audio/opus" = "mpv-slow.desktop"; - "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; - "text/html" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/http" = "librewolf.desktop"; + "x-scheme-handler/https" = "librewolf.desktop"; + "text/html" = "librewolf.desktop"; "text/org" = "emacsclient.desktop"; "text/md" = "emacsclient.desktop"; "text/txt" = "emacsclient.desktop"; "text/rs" = "emacsclient.desktop"; "text/plain" = "emacsclient.desktop"; "application/pdf" = "okular.desktop"; - "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/about" = "librewolf.desktop"; + "x-scheme-handler/unknown" = "librewolf.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; "application/vnd.openxmlformats-officedocuments.spreadsheetml.sheet" = "libreoffice.desktop"; }; diff --git a/home/modules/niri.nix b/home/modules/niri.nix index 7245497..a0b25f8 100644 --- a/home/modules/niri.nix +++ b/home/modules/niri.nix @@ -96,9 +96,9 @@ in in { "XF86AudioRaiseVolume".action.spawn = ["pamixer" "--allow-boost" "-i" "5"]; "XF86AudioLowerVolume".action.spawn = ["pamixer" "--allow-boost" "-d" "5"]; - "Super+E".action = sh ''${pkgs.nushell}/bin/nu /home/chris/bin/nirilof emacs "emacslient -c"''; + "Super+E".action = spawn ["${pkgs.nushell}/bin/nu" "niriemacslof"]; "Super+Return".action.spawn = "alacritty"; - "Super+B".action = spawn ["${pkgs.nushell}/bin/nu" "/home/chris/bin/nirilof" "org.qutebrowser.qutebrowser" "qutebrowser"]; + "Super+B".action = spawn ["${pkgs.nushell}/bin/nu" "nirifflof"]; "Super+Alt+Space".action.spawn = "${pkgs.cosmic-launcher}/bin/cosmic-launcher"; "Super+Space".action.spawn = ["${pkgs.fish}/bin/fish" "-c" "rofi -no-lazy-grab -modi combi -show combi -combi-modi drun,run"]; "Super+Shift+W".action.spawn = "rofi -i -show window"; diff --git a/qmk/qmk_firmware b/qmk/qmk_firmware index 63ec2f6..ff5879f 160000 --- a/qmk/qmk_firmware +++ b/qmk/qmk_firmware @@ -1 +1 @@ -Subproject commit 63ec2f6b300977b057400584b0de8082015eaaa9 +Subproject commit ff5879f6200db4f3ceddd12b8d3683985f41da98 diff --git a/scripts/niriemacslof b/scripts/niriemacslof new file mode 100644 index 0000000..07d82f1 --- /dev/null +++ b/scripts/niriemacslof @@ -0,0 +1,3 @@ +#/usr/bin/env nu + +nu nirilof emacs 'emacsclient -c' \ No newline at end of file diff --git a/scripts/nirifflof b/scripts/nirifflof new file mode 100644 index 0000000..1827191 --- /dev/null +++ b/scripts/nirifflof @@ -0,0 +1,3 @@ +#/usr/bin/env nu + +nu nirilof lw 'librewolf --name lw' \ No newline at end of file diff --git a/systems/nixbook/configuration.nix b/systems/nixbook/configuration.nix index 591dd89..c34efaf 100644 --- a/systems/nixbook/configuration.nix +++ b/systems/nixbook/configuration.nix @@ -8,14 +8,14 @@ ../../modules/base.nix ]; networking.hostName = "nixbook"; - + isoImage.squashfsCompression = "gzip -Xcompression-level 1"; # boot.initrd.kernelModules = [ "i915" ]; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.acpilight.enable = lib.mkDefault true; - networking.interfaces.wlp170s0.useDHCP = true; - networking.useDHCP = false; + # networking.interfaces.wlp170s0.useDHCP = true; + # networking.useDHCP = false; hardware.uinput.enable = true; hardware.bluetooth.enable = true; @@ -27,29 +27,19 @@ boot.supportedFilesystems = [ "ntfs" ]; services = { - desktopManager.plasma6.enable = true; + desktopManager.cosmic.enable = true; + }; + + services.displayManager.cosmic-greeter = { + enable = true; }; programs.nix-ld.enable = true; - security.pam.services.kwallet = { - name = "kwallet"; - enableKwallet = true; - }; + # security.pam.services.kwallet = { + # name = "kwallet"; + # enableKwallet = true; + # }; - systemd = { - oomd = { - enable = true; - enableRootSlice = true; - enableUserSlices = true; - enableSystemSlice = true; - }; - settings.Manager = { - DefaultIOAccounting = true; - DefaultIPAccounting = true; - DefaultTimeoutStopSec = "10s"; - DefaultTimeoutStartSec = "10s"; - }; - }; fonts.packages = with pkgs; [ nerd-fonts.victor-mono noto-fonts @@ -66,11 +56,6 @@ greetd.enableKwallet = true; }; - services.displayManager.sddm = { - enable = true; - wayland.enable = true; - }; - xdg.portal = { enable = true; extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; @@ -97,9 +82,6 @@ environment.variables = { SAL_USE_VCLPLUGIN = "kf5"; - EDITOR = "emacsclient -t -a"; - VISUAL = "emacsclient -c -a"; - QT_LOGGING_RULES = "js=true; kwin_*.debug=true"; # GTK_USE_PORTAL = "1"; # Fixing Qt apps in other environments # Thought I needed this but apparently they are working fine without it. @@ -182,18 +164,18 @@ ]; }; - systemd.services.display-manager = { - wants = [ - "systemd-user-sessions.service" - "multi-user.target" - "network-online.target" - ]; - after = [ - "systemd-user-sessions.service" - "multi-user.target" - "network-online.target" - ]; - }; + # systemd.services.display-manager = { + # wants = [ + # "systemd-user-sessions.service" + # "multi-user.target" + # "network-online.target" + # ]; + # after = [ + # "systemd-user-sessions.service" + # "multi-user.target" + # "network-online.target" + # ]; + # }; # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; diff --git a/systems/nixbook/pkgs.nix b/systems/nixbook/pkgs.nix index c1c0d31..c66645f 100644 --- a/systems/nixbook/pkgs.nix +++ b/systems/nixbook/pkgs.nix @@ -43,18 +43,7 @@ hunspellDicts.en_US-large openssh openssl - kdePackages.ark - kdePackages.breeze - kdePackages.dolphin xdg-utils - kdePackages.kio-fuse - kdePackages.kio-extras - kdePackages.ffmpegthumbs - kdePackages.kdegraphics-thumbnailers - kdePackages.kdesdk-thumbnailers - kdePackages.okular - kdePackages.discover - kdePackages.sddm-kcm hardinfo2 # scribus brightnessctl @@ -65,14 +54,12 @@ aria2 kdePackages.kwallet # nerd-fonts.victor-mono - kdePackages.plasma-browser-integration glxinfo vulkan-tools wayland-utils nextcloud-client papirus-icon-theme phinger-cursors - kdePackages.kde-cli-tools gzip # virt-viewer # inkscape @@ -92,7 +79,6 @@ # gimp power-profiles-daemon python3 - kdePackages.plasma-sdk wireguard-tools # cosmic-settings ];