Merge branch 'clean'

Merge branch that actually fixed sway

flake.lock

@@ -74,11 +74,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1699826676,
-        "narHash": "sha256-L7816eSomVqG1lw07eTMBexHo6F5XxpSiSER+8GXGgU=",
+        "lastModified": 1700076060,
+        "narHash": "sha256-fisxBv+v62yXFpkGCv+qdE8P4hsUJfd+iQoYGgNhMZ4=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "23fea46815371a8e1a0fa340be34d80624cd9bcc",
+        "rev": "2040444da9eb3a9b2438bf98c0568ce06ec4c1e4",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699783872,
-        "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
+        "lastModified": 1700087144,
+        "narHash": "sha256-LJP1RW0hKNWmv2yRhnjkUptMXInKpn/rV6V6ofuZkHU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "280721186ab75a76537713ec310306f0eba3e407",
+        "rev": "ab1459a1fb646c40419c732d05ec0bf2416d4506",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1699701045,
-        "narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=",
+        "lastModified": 1699997707,
+        "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=",
         "owner": "NixOs",
         "repo": "nixos-hardware",
-        "rev": "b689465d0c5d88e158e7d76094fca08cc0223aad",
+        "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699099776,
-        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
+        "lastModified": 1699963925,
+        "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
+        "rev": "bf744fe90419885eefced41b3e5ae442d732712d",
         "type": "github"
       },
       "original": {
@@ -142,11 +142,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1699907094,
-        "narHash": "sha256-9Brl2FJ+xIBRk3CNYsFWzx4pvRYUuM5fSps+GVswTzE=",
+        "lastModified": 1700166954,
+        "narHash": "sha256-f9+JUFDUzwmM+em8wqWgHvgTO4qCCYtKPUZ+nlVIirA=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "9693ccc6b8835a960224c57cb1eb2faceabeda14",
+        "rev": "04d24fb0e6258af7bbe51b29308e670de81a7d2f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -65,7 +65,6 @@
       specialArgs = {inherit inputs;};
       modules = [
         ./hosts/JWST/configuration.nix
-        ./modules/sway.nix
         nixos-hardware.nixosModules.dell-xps-15-9520
         nixos-hardware.nixosModules.common-gpu-nvidia-disable
         { nixpkgs.overlays = overlays; }

hosts/JWST/configuration.nix

@@ -30,6 +30,7 @@
 
   nix.settings.experimental-features = ["nix-command" "flakes"];
   nix.settings.auto-optimise-store = true;
+  nix.settings.trusted-users = [ "root" "tacocat" ];
 
   nix.gc = {
     automatic = true;
@@ -52,19 +53,27 @@
   # Enable CUPS to print documents.
   services.printing.enable = true;
   services.geoclue2.enable = true;
+  services.tlp.enable = true;
 
   # Enable sound.
   sound.enable = true;
-  hardware.pulseaudio.enable = true;
-  services.pipewire.audio.enable = true;
+  # hardware.pulseaudio.enable = true;
+  # services.pipewire.audio.enable = true;
+
+  services.pipewire = {
+    enable = true;
+    audio.enable = true;
+    alsa.enable = true;
+    pulse.enable = true;
+  };
 
   xdg.portal = {
     enable = true;
-    wlr.enable = true;
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-wlr
-      xdg-desktop-portal-gtk
-    ];
+    # wlr.enable = true;
+    # extraPortals = with pkgs; [
+      # xdg-desktop-portal-wlr
+      # xdg-desktop-portal-gtk
+    # ];
   };
 
   hardware.opengl = {
@@ -92,14 +101,15 @@
     brightnessctl
   ];
 
-  # programs.sway.enable = true;
-  # programs.sway.extraPackages = with pkgs; [
-  #   swaylock
-  #   swayidle
-  #   brightnessctl
-  # ];
+  programs.sway.enable = true;
+  programs.sway.wrapperFeatures.gtk = true;
+  programs.sway.extraPackages = with pkgs; [
+    swaylock
+    swayidle
+    brightnessctl
+  ];
 
-  # programs.waybar.enable = true;
+  programs.waybar.enable = true;
   # programs.nm-applet.enable = true;
 
   environment = {

modules/sway.nix

@@ -1,63 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: let
-  # bash script to let dbus know about important env variables and
-  # propagate them to relevent services run at the end of sway config
-  # see
-  # https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist
-  # note: this is pretty much the same as  /etc/sway/config.d/nixos.conf but also restarts
-  # some user services to make sure they have the correct environment variables
-  dbus-sway-environment = pkgs.writeTextFile {
-    name = "dbus-sway-environment";
-    destination = "/bin/dbus-sway-environment";
-    executable = true;
-
-    text = ''
-      dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
-      systemctl --user stop pipewire xdg-desktop-portal xdg-desktop-portal-wlr xdg-desktop-portal-gtk
-      systemctl --user start pipewire xdg-desktop-portal xdg-desktop-portal-wlr xdg-desktop-portal-gtk
-    '';
-  };
-
-  # currently, there is some friction between sway and gtk:
-  # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
-  # the suggested way to set gtk settings is with gsettings
-  # for gsettings to work, we need to tell it where the schemas are
-  # using the XDG_DATA_DIR environment variable
-  # run at the end of sway config
-  configure-gtk = pkgs.writeTextFile {
-    name = "configure-gtk";
-    destination = "/bin/configure-gtk";
-    executable = true;
-    text = let
-      schema = pkgs.gsettings-desktop-schemas;
-      datadir = "${schema}/share/gsettings-schemas/${schema.name}";
-    in ''
-      export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
-      gnome_schema=org.gnome.desktop.interface
-      # gsettings set $gnome_schema gtk-theme 'Dracula'
-    '';
-  };
-in {
-  # environment.systemPackages = [
-  #   dbus-sway-environment
-  #   configure-gtk
-  # ];
-
-  # enable sway window manager
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-    extraPackages = with pkgs; [
-      dbus-sway-environment
-      configure-gtk
-      swaylock
-      swayidle
-      brightnessctl
-    ];
-  };
-  # programs.waybar.enable = true;
-}

users/tacocat/helix/default.nix

@@ -39,6 +39,11 @@
         scrolloff = 5;
         middle-click-paste = false;
         cursorline = true;
+        cursor-shape = {
+          insert = "bar";
+          normal = "block";
+          select = "block";
+        };
         auto-format = false;
         idle-timeout = 400;
         color-modes = true;

users/tacocat/helix/languages.nix

@@ -44,10 +44,10 @@
       texlab = {
         command = "${pkgs.texlab}/bin/texlab";
         config.texlab = {
-          forwardSearch.executable = lib.getExe pkgs.zathura;
+          forwardSearch.executable = "${pkgs.zathura}";
           forwardSearch.args = ["--synctex-forward" "%l:1:%f"];
           build = {
-            executable = lib.getExe pkgs.tectonic;
+            executable = "${pkgs.tectonic}/bin/tectonic";
             onSave = true;
             auxDirectory = "build";
             logDirectory = "build";

users/tacocat/home.nix

@@ -14,6 +14,7 @@
     ];
     packages = with pkgs; [
       rnote
+      libreoffice
       texlive.combined.scheme-medium
       libsixel
       aspell

users/tacocat/shell/default.nix

@@ -13,7 +13,6 @@
     settings = {
       add_newline = false;
       format = lib.concatStrings [
-        # "$line_break"
         "$shlvl"
         "$directory"
         "$git_branch"
@@ -23,6 +22,7 @@
         "$package"
         "$nix_shell"
         "$cmd_duration"
+        "$line_break"
         "$status"
         "$character"
       ];

users/tacocat/shell/fish.nix

@@ -1,8 +1,22 @@
-{...}: {
+{pkgs, ...}: {
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
       set -g fish_greeting
+
+      fish_vi_key_bindings
+      set -g fish_cursor_insert line
     '';
+    plugins = [
+      {
+        name = "z";
+        src = pkgs.fetchFromGitHub {
+          owner = "jethrokuan";
+          repo = "z";
+          rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
+          sha256 = "+FUBM7CodtZrYKqU542fQD+ZDGrd2438trKM0tIESs0=";
+        };
+      }
+    ];
   };
 }

users/tacocat/wayland/default.nix

@@ -21,10 +21,6 @@
 
   xdg.configFile."sway/background.jpg".source = ../background.jpg;
 
-  # wayland.windowManager.sway = {
-  #   enable = true;
-  # };
-
   home.packages = with pkgs; [
     wl-clipboard
     # swaylock

users/tacocat/wayland/sway/config

@@ -1,13 +1,12 @@
 # Default config for sway
 
+include /etc/sway/config.d/*
+
 #
 # Copy this to ~/.config/sway/config and edit it to your liking.
 #
 # Read `man 5 sway` for a complete reference.
 
-exec dbus-sway-environment
-# exec configure-gtk
-
 ### Variables
 #
 # Logo key. Use Mod1 for Alt.
@@ -53,6 +52,7 @@ client.unfocused $unfocus $unfocus $unfocus $unfocus
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
 output * bg ~/.config/sway/background.jpg fill
 
+bar swaybar_command waybar
 #
 # Example configuration:
 #
@@ -65,7 +65,7 @@ output * bg ~/.config/sway/background.jpg fill
 # Example configuration:
 #
 exec swayidle -w \
-         timeout 300 'swaylock -f -c D3869B' \
+         timeout 600 'swaylock -f -c 000000' \
          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
          before-sleep 'swaylock -f -c 000000'
 
@@ -236,23 +236,20 @@ bindsym $mod+r mode "resize"
 
 #
 # Status Bar:
-bar {
-
-     swaybar_command swaybar
 #
 # Read `man 5 sway-bar` for more information about this section.
-     position top
+#     position top
 
 #     # When the status_command prints a new line to stdout, swaybar updates.
 #     # The default just shows the current date and time.
-     status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done
+#     status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done
 
-     colors {
-         statusline #ffffff
-         background #323232
-         inactive_workspace #32323200 #32323200 #5c5c5c
-     }
- }
+#     colors {
+#         statusline #ffffff
+#         background #323232
+#         inactive_workspace #32323200 #32323200 #5c5c5c
+#     }
+# }
 
 #
 # Player
@@ -280,9 +277,6 @@ bar {
 # SwayFX
 #    blur on
 
-xwayland enable
-
-
-# include /etc/sway/config.d/*
+# xwayland enable
 
 include ~/.config/sway/config.d/*

users/tacocat/wayland/sway/config.d/autostart

@@ -1,7 +1,7 @@
 exec nm-applet
+exec systemctl --user restart wireplumber
 exec gammastep-indicator
 exec dunst
-# exec waybar
 #exec swayidle -w \
 #    timeout 600 'swaylock -f -c 14171d' \
 #    before-sleep 'swaylock -f -c 14171d'

users/tacocat/wayland/waybar/default.nix

@@ -2,7 +2,6 @@
   programs.waybar = {
     enable = true;
     style = ./style.css;
-    # systemd.enable = true;
     settings = {
       mainBar = {
         layer = "top";
@@ -10,7 +9,7 @@
         modules-left = [
           "sway/mode"
           "sway/workspaces"
-          "custom/arrow10"
+          # "custom/arrow10"
           "sway/window"
         ];
         modules-right = [