Compare commits

..

No commits in common. "a28d26ed039eb6f6d7cd41151d401744b0c237ed" and "dab5645664358b4301d1798ceea52363db9ba60e" have entirely different histories.

7 changed files with 58 additions and 37 deletions

45
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746769778, "lastModified": 1737093527,
"narHash": "sha256-27w0bzr8XlxEhB+UNiEgf6iySfFu+tVHcBDGah5PtVE=", "narHash": "sha256-A3J+O+IUDSYuNvaQ0QHdkBnTzU188FXzqyhmXeRzUU4=",
"owner": "AdnanHodzic", "owner": "AdnanHodzic",
"repo": "auto-cpufreq", "repo": "auto-cpufreq",
"rev": "eaf8dd1bab1b11ec78ad173ee7ada9886bed92ad", "rev": "cef9bfec79007c48d871feed547eb5d04c15b6e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -27,27 +27,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748226808, "lastModified": 1736373539,
"narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1747900541, "lastModified": 1736978406,
"narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "rev": "b678606690027913f3434dea3864e712b862dde5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,16 +59,32 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748162331, "lastModified": 1736916166,
"narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "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",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -79,6 +95,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"systems": "systems" "systems": "systems"
} }
}, },

View file

@ -2,11 +2,11 @@
description = "NixOS configuration of Julius Freudenberger"; description = "NixOS configuration of Julius Freudenberger";
inputs = { inputs = {
#nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.05"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
auto-cpufreq = { auto-cpufreq = {
@ -20,7 +20,7 @@
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
#nixpkgs-unstable, nixpkgs-unstable,
nixos-hardware, nixos-hardware,
home-manager, home-manager,
auto-cpufreq, auto-cpufreq,
@ -50,10 +50,10 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { specialArgs = {
#pkgs-unstable = import nixpkgs-unstable { pkgs-unstable = import nixpkgs-unstable {
# inherit system; inherit system;
# config.allowUnfree = true; config.allowUnfree = true;
#}; };
inherit inputs outputs username; inherit inputs outputs username;
}; };

View file

@ -1,14 +1,5 @@
{lib, config, pkgs, ...}: { {lib, config, pkgs, pkgs-unstable, ...}: {
programs.zsh = let programs.zsh = {
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; enable = true;
enableCompletion = true; enableCompletion = true;
autosuggestion.enable = true; autosuggestion.enable = true;
@ -26,6 +17,17 @@
history.size = 10000; history.size = 10000;
history.path = "$HOME/.zsh_history"; history.path = "$HOME/.zsh_history";
initContent = lib.mkMerge [ beforeCompInit defaultInit ]; 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:|=*'";
}; };
} }

View file

@ -34,7 +34,6 @@
scrot scrot
i3-scrot i3-scrot
rofi-screenshot
rofirefox rofirefox
rofi-rbw rofi-rbw
rbw rbw

View file

@ -1,5 +1,6 @@
{ {
pkgs, pkgs,
pkgs-unstable,
lib, lib,
... ...
}: { }: {
@ -7,7 +8,7 @@
transmission_4 transmission_4
filezilla filezilla
element-desktop pkgs-unstable.element-desktop
]; ];
programs = { programs = {

View file

@ -1,10 +1,11 @@
{ {
pkgs, pkgs,
pkgs-unstable,
lib, lib,
... ...
}: { }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
cryptomator pkgs-unstable.cryptomator
keepassxc keepassxc
]; ];

View file

@ -5,6 +5,7 @@
}: { }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
typst typst
typst-lsp
typstfmt typstfmt
texliveFull texliveFull