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": 1778406663,
+        "lastModified": 1780154910,
-        "narHash": "sha256-jGOtlDJAe0MFoOErIxSFs3TQZ7WaCpUt1qnjJ0HhLfw=",
+        "narHash": "sha256-aaGjVFEAJQWB69kok/AthcXpT/9yA5Ag2uYDwdbbj5c=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "a0fa2f1b901473d8aefb2e3026396e3562c1782c",
+        "rev": "cf8ccac24e24a2a78fe6f36de9c5d5e9860299a4",
         "type": "github"
       },
       "original": {
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777988971,
+        "lastModified": 1778716662,
-        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778594112,
+        "lastModified": 1780099287,
-        "narHash": "sha256-VA9z90SZviIvOcA4QyatA48FIyqb8mmsmH/EsXXWAG4=",
+        "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1768d4e49860b86cb7652ee738de0e6b3050dd40",
+        "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777594677,
+        "lastModified": 1778805320,
-        "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
+        "narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
+        "rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1778430510,
+        "lastModified": 1779796641,
-        "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=",
+        "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575",
+        "rev": "25f538306313eae3927264466c70d7001dcea1df",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1778443072,
+        "lastModified": 1779560665,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1778510615,
+        "lastModified": 1780161591,
-        "narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=",
+        "narHash": "sha256-eOiIbCMsYMP9JgZXzuT/m41djqDOEHTKjMFrm5NeVHM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "fa8cd368d27cf9541f086485884928315abdcc8c",
+        "rev": "57e5355a843618a717a19d43b2a726a8f27f0bd1",
         "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"
       }
@@ -331,11 +332,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778585655,
+        "lastModified": 1780123543,
-        "narHash": "sha256-yfxy9aTlIgU2Z36H8cJURgYLgjT4qvFeOzoAC/HXcKM=",
+        "narHash": "sha256-vRHmt1N3rPgLJFcSQfHb2c3F7edzVPcyAk6/2QYmO1s=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "42f41abcef13dc81c85407b57aa1fd1bde46e46c",
+        "rev": "7e1dae7aa169ad02f18ca11da247008181b2dc7f",
         "type": "github"
       },
       "original": {

modules/cli/nixvim.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, userConfig, ... }:
 
 {
   programs.nixvim = {
@@ -224,7 +224,20 @@
             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;
         };

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/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

@@ -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" ];