Update flake.lock

Add rofi-screenshot utility
Migrate zsh configuration to new programs.zsh.initContent
2025-05-27 22:03:15 +03:00 · 2025-05-27 22:02:54 +03:00 · 2025-05-27 22:01:53 +03:00 · 2025-05-27 22:01:39 +03:00 · 2025-05-27 22:00:33 +03:00
7 changed files with 37 additions and 58 deletions
--- a/flake.lock
+++ b/flake.lock
@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737093527,
-        "narHash": "sha256-A3J+O+IUDSYuNvaQ0QHdkBnTzU188FXzqyhmXeRzUU4=",
+        "lastModified": 1746769778,
+        "narHash": "sha256-27w0bzr8XlxEhB+UNiEgf6iySfFu+tVHcBDGah5PtVE=",
        "owner": "AdnanHodzic",
        "repo": "auto-cpufreq",
-        "rev": "cef9bfec79007c48d871feed547eb5d04c15b6e7",
+        "rev": "eaf8dd1bab1b11ec78ad173ee7ada9886bed92ad",
        "type": "github"
      },
      "original": {
@ -27,27 +27,27 @@
        ]
      },
      "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "lastModified": 1748226808,
+        "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1736978406,
-        "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
+        "lastModified": 1747900541,
+        "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "b678606690027913f3434dea3864e712b862dde5",
+        "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06",
        "type": "github"
      },
      "original": {
@ -59,32 +59,16 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1736916166,
-        "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
+        "lastModified": 1748162331,
+        "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
+        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1737062831,
-        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -95,7 +79,6 @@
        "home-manager": "home-manager",
        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
        "systems": "systems"
      }
    },
--- a/flake.nix
+++ b/flake.nix
@ -2,11 +2,11 @@
  description = "NixOS configuration of Julius Freudenberger";

  inputs = {
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    #nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    auto-cpufreq = {
@ -20,7 +20,7 @@
  outputs = {
    self,
    nixpkgs,
-    nixpkgs-unstable,
+    #nixpkgs-unstable,
    nixos-hardware,
    home-manager,
    auto-cpufreq,
@ -50,10 +50,10 @@
        system = "x86_64-linux";

        specialArgs = {
-          pkgs-unstable = import nixpkgs-unstable {
-            inherit system;
-            config.allowUnfree = true;
-          };
+          #pkgs-unstable = import nixpkgs-unstable {
+          #  inherit system;
+          #  config.allowUnfree = true;
+          #};
 	  inherit inputs outputs username;
        };

--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@ -1,5 +1,14 @@
-{lib, config, pkgs, pkgs-unstable, ...}: {
-  programs.zsh = {
+{lib, config, pkgs, ...}: {
+  programs.zsh = let
+    beforeCompInit = lib.mkOrder 550 "zstyle ':completion:*' matcher-list '' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'r:|[._-]=* r:|=*'";
+    defaultInit = ''
+      setopt promptsubst
+      export PROMPT='%F{12}[%f%F{10}%n%f%F{12}@%f%F{white}%m%f%F{12}]%f%F{white}:%f %F{white}%~%f%F{12}>%b$(${lib.getExe pkgs.gitprompt-rs} zsh)%f%F{10}%(!.#.$)%f '
+      unsetopt beep
+      bindkey '^R' history-incremental-search-backward
+    '';
+  in
+  {
    enable = true;
    enableCompletion = true;
    autosuggestion.enable = true;
@ -17,17 +26,6 @@
    history.size = 10000;
    history.path = "$HOME/.zsh_history";

-    plugins = [
-
-    ];
-
-    initExtra = ''
-      setopt promptsubst
-      export PROMPT='%F{12}[%f%F{10}%n%f%F{12}@%f%F{white}%m%f%F{12}]%f%F{white}:%f %F{white}%~%f%F{12}>%b$(${lib.getExe pkgs-unstable.gitprompt-rs} zsh)%f%F{10}%(!.#.$)%f '
-      unsetopt beep
-      bindkey '^R' history-incremental-search-backward
-    '';
-
-    initExtraBeforeCompInit = "zstyle ':completion:*' matcher-list '' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'r:|[._-]=* r:|=*'";
+    initContent = lib.mkMerge [ beforeCompInit defaultInit ];
  };
 }
--- a/modules/i3.nix
+++ b/modules/i3.nix
@ -34,6 +34,7 @@

 	scrot
        i3-scrot
+        rofi-screenshot
 	rofirefox
 	rofi-rbw
 	rbw
--- a/modules/internet.nix
+++ b/modules/internet.nix
@ -1,6 +1,5 @@
 {
  pkgs,
-  pkgs-unstable,
  lib,
  ...
 }: {
@ -8,7 +7,7 @@
    transmission_4
    filezilla

-    pkgs-unstable.element-desktop
+    element-desktop
  ];

  programs = {
--- a/modules/security.nix
+++ b/modules/security.nix
@ -1,11 +1,10 @@
 {
  pkgs,
-  pkgs-unstable,
  lib,
  ...
 }: {
  environment.systemPackages = with pkgs; [
-    pkgs-unstable.cryptomator
+    cryptomator

    keepassxc
  ];
--- a/modules/typesetting.nix
+++ b/modules/typesetting.nix
@ -5,7 +5,6 @@
 }: {
  environment.systemPackages = with pkgs; [
    typst
-    typst-lsp
    typstfmt

    texliveFull
Author	SHA1	Message	Date
JuliusFreudenberger	a28d26ed03	Update flake.lock	2025-05-27 22:03:15 +03:00
JuliusFreudenberger	67e1a5c9f5	Add rofi-screenshot utility	2025-05-27 22:02:54 +03:00
JuliusFreudenberger	c14b427f49	Migrate zsh configuration to new programs.zsh.initContent	2025-05-27 22:01:53 +03:00
JuliusFreudenberger	289eecc497	Use packages from stable which were from unstable before	2025-05-27 22:01:39 +03:00
JuliusFreudenberger	fb88bd8c55	Update to NixOS 25.05 Remove typst-lsp as it is removed from nixpkgs.	2025-05-27 22:00:33 +03:00