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  |
@@ -21,12 +21,19 @@ Requires Nix-channel with [NixOS 24.11](https://nixos.org/)
 
 ## Commands
 
-Scripts will not run unless the necessary packages have been added to the path, either in a shell or by running nixos-rebuild
+First time run, will create a shell with the minimum dependencies in order to download the rest
+
+```Shell
+nix develop . --experimental-features 'nix-command flakes'
+just switch-now
+```
+
+Scripts below will not run unless the necessary packages have been added to the path, either in a shell or by running nixos-rebuild
 
 Format all .nix files
 
 ```Shell
-  ./fmt
+  just fmt
 ```
 
 Rebuild and test Nix configuration
@@ -34,7 +41,7 @@ Rebuild and test Nix configuration
 - Will add all new files to git and format all nix-files
 
 ```Shell
-  ./test
+  just test
 ```
 
 Rebuild and switch Nix configuration
@@ -42,7 +49,7 @@ Rebuild and switch Nix configuration
 - Will add all new files to git and format all nix-files
 
 ```Shell
-  ./rebuild
+  just switch
 ```
 
 Update and switch
@@ -50,5 +57,5 @@ Update and switch
 - Will update the flakes and nix-channel, then switch if there are no errors
 
 ```Shell
-  ./update
+  just update
 ```

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,17 +37,25 @@
     }:
     let
       system = "x86_64-linux";
-      hostname = "thinkpad";
+      pkgs = nixpkgs.legacyPackages.${system};
       inherit (self) outputs;
       common = import ./common.nix;
     in
     {
       defaultPackages.${system} = home-manager.defaultPackage.${system};
 
-      # Adds the nix fmt command to format nix files
+      # The minimum amount of dependencies in order to run 'just switch-now'
-      formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
+      devShells.${system}.default = pkgs.mkShell {
+        packages = with pkgs; [
+          just
+          nh
+        ];
+      };
 
-      nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem {
+      # Adds the nix fmt command to format nix files
+      formatter.${system} = pkgs.nixfmt-rfc-style;
+
+      nixosConfigurations.${common.hostname} = nixpkgs.lib.nixosSystem {
         system = system;
         specialArgs = { inherit outputs inputs; }; # Pass args to modules
         modules = [

fmt

@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-# Format all files matched by treefmt.toml
-
-treefmt --on-unmatched info

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,11 @@
     extensions = [
       "html"
       "catppuccin"
+      "catppuccin-icons"
       "toml"
       "nix"
-      "git_firefly"
+      "git-firefly"
+      "just"
     ];
     userSettings =
       let
@@ -20,10 +22,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 = {

justfile

@@ -0,0 +1,24 @@
+default:
+    @just --list
+
+fmt:
+    treefmt --on-unmatched info
+
+test *FLAGS:
+    git add .
+    just fmt
+    nh os test . {{FLAGS}}
+
+switch *FLAGS:
+    git add .
+    just fmt
+    nh os switch . {{FLAGS}}
+
+switch-now *FLAGS:
+    nh os switch . {{FLAGS}}
+
+update:
+    nix-channel --update
+    nix flake update
+
+    just switch

modules/battery.nix

@@ -1,3 +1,6 @@
 {
-  services.upower.enable = true;
+  services = {
+    upower.enable = true;
+    power-profiles-daemon.enable = true;
+  };
 }

modules/development.nix

@@ -14,6 +14,7 @@
     rustup
     nodejs_22
     pnpm
+    just
     gcc # Required for C, Rust and others
     # Language servers
     nixd

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 = {

switch

@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-
-# Accepts all arguments to nh os switch
-# For example --ask to prompt if the user want to switch configs
-
-# Rebuild and switch the environment if successful
-git add .
-./fmt
-nh os switch . "$@"

test

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-# Rebuild and switch the environment if successful
-git add .
-./fmt
-nh os test . "$@"

update

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-nix-channel --update
-nix flake update
-
-./switch