Merge remote-tracking branch 'origin/main' into thinkpad

README.md

@@ -12,7 +12,7 @@ My NixOS configurations with dotfiles for my desktop
 | Shell  | Fish       |
 | Prompt | Starship   |
 | Theme  | Catppuccin |
-| GPU    | NVidia     |
+| GPU    | Nvidia     |
 | Panel  | Hyprpanel  |
 | Runner | Rofi       |
 | Fetch  | Fastfetch  |

common.nix

@@ -20,7 +20,8 @@ rec {
     options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT
   };
 
-  monitor1 = ""; # Empty matches all
+  # Empty matches all
+  monitor1 = "";
 
   username = "martin";
 

configuration.nix

@@ -54,7 +54,7 @@ in
     vdhcoapp
     fortune
     cowsay
-    inputs.zen-browser.packages."${system}".default # beta
+    inputs.zen-browser.packages.${system}.default # beta
     onlyoffice-desktopeditors
   ];
 

flake.nix

@@ -37,7 +37,6 @@
     }:
     let
       system = "x86_64-linux";
-      hostname = "thinkpad";
       inherit (self) outputs;
       common = import ./common.nix;
     in
@@ -47,7 +46,7 @@
       # Adds the nix fmt command to format nix files
       formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
 
-      nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem {
+      nixosConfigurations.${common.hostname} = nixpkgs.lib.nixosSystem {
         system = system;
         specialArgs = { inherit outputs inputs; }; # Pass args to modules
         modules = [

home-manager/default-applications.nix

@@ -6,6 +6,7 @@
       let
         browser = "zen.desktop";
         imageViewer = "org.gnome.Loupe.desktop";
+        pdfReader = "org.gnome.Papers.desktop";
       in
       {
         "text/html" = browser;
@@ -17,6 +18,7 @@
         "image/jpeg" = imageViewer;
         "image/png" = imageViewer;
         "image/gif" = imageViewer;
+        "application/pdf" = pdfReader;
       };
   };
 }

home-manager/development/git.nix

@@ -5,6 +5,7 @@
     userEmail = "git@martials.no";
 
     aliases = {
+      amend = "commit --amend";
       cm = "commit";
       s = "status";
     };

home-manager/development/zed.nix

@@ -7,9 +7,10 @@
     extensions = [
       "html"
       "catppuccin"
+      "catppuccin-icons"
       "toml"
       "nix"
-      "git_firefly"
+      "git-firefly"
     ];
     userSettings =
       let
@@ -20,10 +21,15 @@
       {
         autosave = "on_focus_change";
         base_keymap = "JetBrains";
-        ui_font_family = font;
         buffer_font_family = font;
+        icon-theme = "Catppuccin Mocha"; # TODO doesn't work?
+        ui_font_family = font;
         ui_font_size = fontSize;
         buffer_font_size = fontSize;
+        tabs = {
+          file_icons = true;
+          git_status = true;
+        };
         theme = {
           mode = theme.mode;
           light = "Catppuccin Latte";

home-manager/hyprland/hypridle/default.nix

@@ -5,7 +5,6 @@ let
   suspendAfter = 7200;
 in
 {
-  wayland.windowManager.hyprland.settings.exec-once = [ "hypridle" ];
   services.hypridle = {
     enable = true;
     settings = {
@@ -35,4 +34,5 @@ in
       ];
     };
   };
+  wayland.windowManager.hyprland.settings.exec-once = [ "hypridle" ];
 }

home-manager/hyprland/settings.nix

@@ -1,8 +1,8 @@
 { lib, ... }:
 let
   common = import ../../common.nix;
-  app = common.default;
   theme = import ../../theme.nix;
+  app = common.default;
 in
 {
   wayland.windowManager.hyprland.settings = {

modules/gnome/default.nix

@@ -15,6 +15,7 @@
     gnome-calculator
     gnome-disk-utility
     gnome-clocks
+    papers # PDFReader
   ];
 
   programs.dconf.enable = true; # Required for some gnome applications

modules/hyprland/default.nix

@@ -7,7 +7,9 @@
     hyprpolkitagent # Auth deamon providing modals for password auth
     hyprshot # Screenshots
     hyprsunset # Blue light filter
-    # unstable.hyprsysteminfo TODO requires flake update
+    unstable.hyprsysteminfo
+    unstable.hyprland-qtutils
+    unstable.hyprland-qt-support
   ];
 
   programs = {