Merge branch 'master' of github.com:szymon-jozef/amazing-dotfiles

README.md

@@ -1,3 +1,5 @@
+# This repo is now deprecated in favor of new [nixos-born-again](https://github.com/szymon-jozef/nixos-born-again)
+
 ![Nix](https://img.shields.io/badge/Nix-unstable-blue.svg?logo=nixos&logoColor=white)
 ![Home Manager](https://img.shields.io/badge/Home_Manager-enabled-brightgreen.svg)
 # My even cooler than previous dotfiles!

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777024856,
+        "lastModified": 1780154910,
-        "narHash": "sha256-OQ+yIcRMXo4UaHyX+W5DCgBvJ5dZo/3kFGWPJiuR6x8=",
+        "narHash": "sha256-aaGjVFEAJQWB69kok/AthcXpT/9yA5Ag2uYDwdbbj5c=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "f41cc1cf13647e482b7317396f749840ef715e16",
+        "rev": "cf8ccac24e24a2a78fe6f36de9c5d5e9860299a4",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775087534,
+        "lastModified": 1778716662,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777349711,
+        "lastModified": 1780099287,
-        "narHash": "sha256-PGKgo2dO6fK603QGI+DWXdKmS09pbJjjTxwRHdhkGZA=",
+        "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c1140540536d483e2730320100f6835d62c94fdf",
+        "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776184304,
+        "lastModified": 1778805320,
-        "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
+        "narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3c7524c68348ef79ce48308e0978611a050089b2",
+        "rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1777077449,
+        "lastModified": 1779796641,
-        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
+        "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
+        "rev": "25f538306313eae3927264466c70d7001dcea1df",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1776877367,
+        "lastModified": 1779560665,
-        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1777236345,
+        "lastModified": 1780161591,
-        "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=",
+        "narHash": "sha256-eOiIbCMsYMP9JgZXzuT/m41djqDOEHTKjMFrm5NeVHM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4",
+        "rev": "57e5355a843618a717a19d43b2a726a8f27f0bd1",
         "type": "github"
       },
       "original": {
@@ -204,11 +204,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771423342,
+        "lastModified": 1776659114,
-        "narHash": "sha256-7uXPiWB0YQ4HNaAqRvVndYL34FEp1ZTwVQHgZmyMtC8=",
+        "narHash": "sha256-qapCOQmR++yZSY43dzrp3wCrkOTLpod+ONtJWBk6iKU=",
         "owner": "pyproject-nix",
         "repo": "build-system-pkgs",
-        "rev": "04e9c186e01f0830dad3739088070e4c551191a4",
+        "rev": "ffaa2161dd5d63e0e94591f86b54fc239660fb2e",
         "type": "github"
       },
       "original": {
@@ -225,11 +225,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771518446,
+        "lastModified": 1776715674,
-        "narHash": "sha256-nFJSfD89vWTu92KyuJWDoTQJuoDuddkJV3TlOl1cOic=",
+        "narHash": "sha256-Gs1VnEkCkkRZxJQAC/Dhz0Jbfi22mFXChbtNg9w/Ybg=",
         "owner": "pyproject-nix",
         "repo": "pyproject.nix",
-        "rev": "eb204c6b3335698dec6c7fc1da0ebc3c6df05937",
+        "rev": "69f57f27e52a87c54e28138a75ec741cd46663c9",
         "type": "github"
       },
       "original": {
@@ -254,15 +254,16 @@
     },
     "systems": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1774449309,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
         "owner": "nix-systems",
         "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
+        "ref": "future-26.11",
         "repo": "default",
         "type": "github"
       }
@@ -294,11 +295,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772408201,
+        "lastModified": 1777895960,
-        "narHash": "sha256-3Va9Tq/tg9ZuCX+PFd9oPgwtBDQRjjh60cYKZjZDxNM=",
+        "narHash": "sha256-KebDsQd+A7pm++Tp0744EjULttHvz1wbKqNKkMA/088=",
         "owner": "pyproject-nix",
         "repo": "uv2nix",
-        "rev": "4bac9176117824d4550deeba9b86d9f96ac5d081",
+        "rev": "5ad90d48b80ecc920ca2247d53f46beba302e186",
         "type": "github"
       },
       "original": {
@@ -331,11 +332,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777356688,
+        "lastModified": 1780123543,
-        "narHash": "sha256-fOhJpz7QAkBWAAih72CmnIfIN0pHfuZjhZQ/hBLNWxo=",
+        "narHash": "sha256-vRHmt1N3rPgLJFcSQfHb2c3F7edzVPcyAk6/2QYmO1s=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "b3c972b3d8537a9cf7a0db96b164c9c3e580884a",
+        "rev": "7e1dae7aa169ad02f18ca11da247008181b2dc7f",
         "type": "github"
       },
       "original": {
@@ -354,11 +355,11 @@
         "uv2nix": "uv2nix"
       },
       "locked": {
-        "lastModified": 1773515729,
+        "lastModified": 1778101628,
-        "narHash": "sha256-+TfrJdqRxmzarLednTCFfxDi1uGNYnIbtyLAFw2Pj0U=",
+        "narHash": "sha256-6/x1NOD8QyI+up09LsQdyX7EEd0w7Qr5o9JeQ3AqLHk=",
         "owner": "szymon-jozef",
         "repo": "zut-calendar",
-        "rev": "3284491807e196414445326d11913b43e7a0225f",
+        "rev": "b69ae15381ca37f763c1ef072c67d953017c8bd4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -70,9 +70,14 @@
         statusBar = "ashell"; # available: ashell | waybar
 
         pathConfig = {
-          wallpaper = "Obrazy/tapety/catppuccin";
+          wallpaper = "Obrazy/tapety/catppuccin"; # relative to $HOME/
-          screenshot = "Obrazy/zrzuty/";
+          screenshot = "Obrazy/zrzuty/"; # relative to $HOME/
-          obsidian = "Dokumenty/obsidian";
+          obsidian = "Dokumenty/obsidian"; # relative to $HOME/
+          projects = "~/Kodowanie";
+          documents = "~/Dokumenty";
+          pictures = "~/Obrazy";
+          downloads = "~/Pobrane";
+          video = "~/Video";
         };
 
         isNixOS = true;

home.nix

@@ -42,6 +42,7 @@
     ./modules/cli/git.nix
     ./modules/cli/fastfetch.nix
     ./modules/cli/kdeconnect.nix
+    ./modules/cli/topgrade.nix
     # gui tools
     ./modules/gui/kitty.nix
     ./modules/gui/satty.nix

modules/cli/fish.nix

@@ -200,11 +200,31 @@
               end
             '';
       };
+
+      blog_build_and_push = {
+        body =
+          # fish
+          ''
+            set USER szymon
+            set HOST dmowski
+            set DIR /srv/blog/
+            set blog_dir ~/Dokumenty/blog
+
+            pushd $blog_dir || exit 1
+
+            hugo build && rsync -avz --delete public/ $USER@$HOST:$DIR
+
+            popd
+
+            exit 0
+          '';
+      };
     };
     shellAliases = {
       ls = "eza --long --icons --group-directories-first --git";
       lst = "eza --long --icons --color --git --tree";
       rm = "trash";
+      # update = "topgrade";
     };
   };
 }

modules/cli/nixvim.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, userConfig, ... }:
 
 {
   programs.nixvim = {
@@ -224,16 +224,26 @@
             installRustc = true;
           };
           # nix
-          nil_ls.enable = true;
+          nixd = {
+            enable = true;
+            filetypes = [ "nix" ];
+            formatting = {
+              command = [ "nixfmt" ];
+            };
+
+            nixpkgs.expr = ''
+              import (builtins.getFlake "/etc/nixos/").inputs.nixpkgs { }
+            '';
+            home-manager.expr = ''
+              (builtins.getFlake "/home/${userConfig.username}/.home-manager").homeConfigurations."${userConfig.username}@${userConfig.hostName}".options
+            '';
+          };
           # other
           marksman.enable = true;
         };
         keymaps = {
           lspBuf = {
-            "gd" = "definition";
-            "gi" = "implementation";
             "<leader>ca" = "code_action";
-            "<leader>cf" = "format";
             "<leader>r" = "rename";
           };
         };

modules/cli/topgrade.nix

@@ -0,0 +1,53 @@
+{ ... }:
+
+let
+  system_path = "/etc/nixos";
+  home_path = "~/.config/home-manager/";
+in
+{
+  programs.topgrade = {
+    enable = true;
+    settings = {
+      misc = {
+        assume_yes = true;
+        pre_sudo = true;
+        disable = [
+          "flutter"
+          "node"
+          "hyprpm"
+        ];
+        cleanup = false;
+        notify_end = "never";
+        nix_handle = "nh";
+      };
+
+      git = {
+        repos = [ "$XDG_PROJECTS_DIR/*" ];
+      };
+
+      pre_commands = {
+        "Git commit before system flake update" =
+          "cd ${system_path} && git add -A && git commit --allow-empty -m 'chore: state before system update'";
+        "Git commit before home flake update" =
+          "cd ${home_path} && git add -A && git commit --allow-empty -m 'chore: state before home update'";
+        "Git pull before system flake update " = "cd ${system_path} && git pull";
+        "Git pull before home flake update " = "cd ${home_path} && git pull";
+      };
+
+      commands = {
+        "Update system flake" = "cd ${system_path} && nix flake update";
+        "Update home flake" = "cd ${home_path} && nix flake update";
+      };
+
+      post_commands = {
+        "Git commit after system flake update" =
+          "cd ${system_path} && git add -A && git commit --allow-empty -m 'chore: state after system update'";
+        "Git commit after home flake update" =
+          "cd ${home_path} && git add -A && git commit --allow-empty -m 'chore: state after home update'";
+        "Git push system configuration" = "cd ${system_path} && git push";
+        "Git push home configuration" = "cd ${home_path} && git push";
+      };
+
+    };
+  };
+}

modules/cli/yazi.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ userConfig, ... }:
 
 {
   programs.yazi = {
@@ -37,6 +37,41 @@
           "yank"
         ];
       }
+      {
+        on = [
+          "g"
+          "p"
+        ];
+        run = "cd ${userConfig.pathConfig.downloads}";
+      }
+      {
+        on = [
+          "g"
+          "d"
+        ];
+        run = "cd ${userConfig.pathConfig.documents}";
+      }
+      {
+        on = [
+          "g"
+          "v"
+        ];
+        run = "cd ${userConfig.pathConfig.video}";
+      }
+      {
+        on = [
+          "g"
+          "o"
+        ];
+        run = "cd ${userConfig.pathConfig.pictures}";
+      }
+      {
+        on = [
+          "g"
+          "k"
+        ];
+        run = "cd ${userConfig.pathConfig.projects}";
+      }
     ];
   };
 }

modules/gui/mangohud.nix

@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   userConfig,
   ...
@@ -10,7 +9,8 @@
 
   programs.mangohud = {
     enable = true;
-    package = if userConfig.isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
+    package =
+      if userConfig.isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
   };
 
   xdg.configFile."MangoHud/MangoHud.conf".text = ''

modules/hypr/hyprland/apps/communicators.nix

@@ -11,7 +11,7 @@
       ];
 
       bind = [
-        "$mainMod Control_L, s, exec,[workspace 1] signal-desktop --password-store=\"kwallet6\""
+        "$mainMod Control_L, s, exec,[workspace 1] $signal_client"
         "$mainMod Control_L, s, focuswindow, class:^(signal)$"
         "$mainMod Control_L, s, focuswindow, title:^(signal)$"
         "$mainMod Control_L, v, sendshortcut, ctrl, k, class:^(vesktop)$"

modules/hypr/hyprland/env.nix

@@ -5,6 +5,7 @@
 }:
 let
   uwsm_run = "${pkgs.uwsm}/bin/uwsm app";
+  signal_client = "${pkgs.kitty}/bin/kitty --title 'gurk' ${pkgs.gurk-rs}/bin/gurk";
 in
 {
   wayland.windowManager.hyprland = {
@@ -17,6 +18,7 @@ in
       "$notes" = "${pkgs.obsidian}/bin/obsidian";
       "$browser" = if userConfig.isNixOS then "zen-beta" else "zen-browser"; # beta on nixos
       "$openrgb_color" = "09ce30";
+      "$signal_client" = signal_client;
 
       env = [
         "XCURSOR_SIZE, 32"

modules/hypr/hyprland/hardware.nix

@@ -11,15 +11,16 @@
         kb_rules = "";
         follow_mouse = 1;
         left_handed = false;
-        sensitivity = -0.5;
+        sensitivity = 0;
         touchpad = {
           natural_scroll = true;
         };
       };
 
+      # mouse has super high dpi so lover the sensitivity!
       device = {
-        name = "msft0001:01-06cb:7f28-touchpad";
+        name = "corsair-corsair-m75-gaming-mouse";
-        sensitivity = 0;
+        sensitivity = -0.5;
       };
 
       cursor = {

modules/packages.nix

@@ -15,6 +15,7 @@ let
     ];
   };
 in
+
 {
   home.packages =
     with pkgs;
@@ -38,6 +39,9 @@ in
       bc
       nh
       runc
+      nixfmt
+      zathura
+      zathuraPkgs.zathura_pdf_mupdf
 
       # Music
       spotify
@@ -46,6 +50,8 @@ in
       homebank
       gimp
       rstudio-with-packages
+      feh
+      libreoffice
 
       # Messaging
       vesktop
@@ -57,7 +63,7 @@ in
       prismlauncher
       heroic
       # lutris
-      rpcs3
+      pkgs-stable.rpcs3
       pcsx2
     ];
 

modules/xdg.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ userConfig, ... }:
 
 let
   browserFallback = [
@@ -7,6 +7,8 @@ let
     "brave.desktop"
     "chromium.desktop"
   ];
+
+  imageViewer = "feh.desktop";
 in
 {
   xdg.portal.config = {
@@ -38,9 +40,12 @@ in
       "audio/mpeg" = [ "mpv.desktop" ];
 
       "image/*" = [ "org.kde.koko.desktop" ];
-      "image/png" = [ "feh.desktop" ];
+      "image/png" = [ imageViewer ];
-      "image/bmp" = [ "feh.desktop" ];
+      "image/jpeg" = [ imageViewer ];
-      "image/svg+xml" = [ "feh.desktop" ];
+      "image/jpg" = [ imageViewer ];
+      "image/bmp" = [ imageViewer ];
+      "image/svg+xml" = [ imageViewer ];
+      "image/webp" = [ imageViewer ];
 
       "x-scheme-handler/discord" = [ "vesktop.desktop" ];
       "x-scheme-handler/sgnl" = [ "signal-desktop.desktop" ];
@@ -52,12 +57,12 @@ in
     enable = true;
     createDirectories = true;
     desktop = null;
-    documents = "$HOME/Dokumenty";
+    documents = baseNameOf userConfig.pathConfig.documents;
-    download = "$HOME/Pobrane";
+    download = baseNameOf userConfig.pathConfig.downloads;
     music = null;
-    pictures = "$HOME/Obrazy";
+    pictures = baseNameOf userConfig.pathConfig.pictures;
-    videos = "$HOME/Video";
+    videos = baseNameOf userConfig.pathConfig.video;
-    projects = "$HOME/Kodowanie";
+    projects = baseNameOf userConfig.pathConfig.projects;
     templates = null;
     publicShare = null;
     setSessionVariables = true;