diff --git a/flake.lock b/flake.lock index eb56fae..f908edd 100644 --- a/flake.lock +++ b/flake.lock @@ -261,18 +261,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "host": "gitlab.gnome.org", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", - "type": "github" + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.1", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -282,16 +284,16 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1764536451, + "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -440,16 +442,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -485,6 +487,38 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -600,9 +634,7 @@ "nix-filter": [ "nix-filter" ], - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1757763404, @@ -626,9 +658,7 @@ "nix-filter": [ "nix-filter" ], - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1757763091, @@ -691,16 +721,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763845106, - "narHash": "sha256-S3HH655nydKoLTuqX8qcJidZH0PiWGB/YcoPomH1DaQ=", + "lastModified": 1764600318, + "narHash": "sha256-PtJfp13TUHZ24Z3ybeb2W3pOr+SEjI3xkcTumgGT28E=", "owner": "nix-community", "repo": "stylix", - "rev": "b9b8173a6e31c6d06f328307ddbdf7d6af82b7ad", + "rev": "c9760a6a2ba532e6d0dcae804b7cb62ec7198f70", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index 5a9e608..e997171 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -41,7 +41,8 @@ servicepoint-cli = { url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"; inputs = { - nixpkgs.follows = "nixpkgs"; + # TODO: update flake to 25.11 + # nixpkgs.follows = "nixpkgs"; naersk.follows = "naersk"; nix-filter.follows = "nix-filter"; }; @@ -49,7 +50,8 @@ servicepoint-simulator = { url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git"; inputs = { - nixpkgs.follows = "nixpkgs"; + # TODO: update flake to 25.11 + # nixpkgs.follows = "nixpkgs"; naersk.follows = "naersk"; nix-filter.follows = "nix-filter"; }; @@ -59,7 +61,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:nix-community/stylix/release-25.05"; + url = "github:nix-community/stylix/release-25.11"; inputs = { nixpkgs.follows = "nixpkgs"; nur.follows = "nur"; diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/vinzenz/default.nix index a8a0d28..4847729 100644 --- a/homeConfigurations/vinzenz/default.nix +++ b/homeConfigurations/vinzenz/default.nix @@ -42,7 +42,7 @@ ]; }; - thefuck = { + pay-respects = { enable = true; enableZshIntegration = true; }; diff --git a/homeConfigurations/vinzenz/git.nix b/homeConfigurations/vinzenz/git.nix index 537fe61..df51eda 100644 --- a/homeConfigurations/vinzenz/git.nix +++ b/homeConfigurations/vinzenz/git.nix @@ -1,15 +1,17 @@ { config.programs.git = { enable = true; - userName = "Vinzenz Schroeter"; - userEmail = "vinzenz.f.s@gmail.com"; + settings = { + user = { + name = "Vinzenz Schroeter"; + email = "vinzenz.f.s@gmail.com"; + }; - aliases = { - prettylog = "log --pretty=oneline --graph"; - spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d"; - }; + aliases = { + prettylog = "log --pretty=oneline --graph"; + spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d"; + }; - extraConfig = { pull.ff = "only"; merge.tool = "kdiff3"; push.autoSetupRemote = "true"; diff --git a/homeConfigurations/vinzenz/ssh.nix b/homeConfigurations/vinzenz/ssh.nix index 20b4bae..8643fc9 100644 --- a/homeConfigurations/vinzenz/ssh.nix +++ b/homeConfigurations/vinzenz/ssh.nix @@ -1,6 +1,7 @@ { config.programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks = { "vpn2" = { host = "vpn2 hetzner-vpn2"; diff --git a/homeModules/git.nix b/homeModules/git.nix index 76afceb..5da1ba7 100644 --- a/homeModules/git.nix +++ b/homeModules/git.nix @@ -2,7 +2,7 @@ programs = { git = { enable = true; - extraConfig.init.defaultBranch = "main"; + settings.init.defaultBranch = "main"; }; gh = { diff --git a/nixosConfigurations/hetzner-vpn2/nginx.nix b/nixosConfigurations/hetzner-vpn2/nginx.nix index 2e5dc06..126e690 100644 --- a/nixosConfigurations/hetzner-vpn2/nginx.nix +++ b/nixosConfigurations/hetzner-vpn2/nginx.nix @@ -1,7 +1,7 @@ { pkgs, ... }: let blog-domain-socket = "/run/nginx/blog.sock"; - anubis-domain-socket = "/run/anubis/anubis-blog.sock"; + anubis-domain-socket = "/run/anubis/anubis-blog/anubis.sock"; in { security.acme = { @@ -42,7 +42,7 @@ in }; }; - anubis.instances.main = { + anubis.instances.blog = { enable = true; settings = { BIND = anubis-domain-socket; diff --git a/nixosModules/amd-graphics.nix b/nixosModules/amd-graphics.nix index cca6393..9bc386c 100644 --- a/nixosModules/amd-graphics.nix +++ b/nixosModules/amd-graphics.nix @@ -7,11 +7,6 @@ graphics.enable = true; amdgpu = { opencl.enable = true; - amdvlk = { - # TODO: this creates black borders around GNOME apps - # enable = true; - # support32Bit.enable = config.hardware.graphics.enable32Bit; - }; overdrive.enable = true; }; }; diff --git a/nixosModules/gnome.nix b/nixosModules/gnome.nix index 9c31f62..ead61d0 100644 --- a/nixosModules/gnome.nix +++ b/nixosModules/gnome.nix @@ -12,18 +12,17 @@ config = lib.mkMerge [ { services = { - xserver = { - # Enable the GNOME Desktop Environment. - desktopManager.gnome = { - enable = true; - extraGSettingsOverridePackages = [ pkgs.mutter ]; - extraGSettingsOverrides = '' - [org.gnome.mutter] - experimental-features=['scale-monitor-framebuffer'] - ''; - }; - displayManager.gdm.enable = true; - excludePackages = [ pkgs.xterm ]; + xserver.excludePackages = [ pkgs.xterm ]; + + # Enable the GNOME Desktop Environment. + displayManager.gdm.enable = true; + desktopManager.gnome = { + enable = true; + extraGSettingsOverridePackages = [ pkgs.mutter ]; + extraGSettingsOverrides = '' + [org.gnome.mutter] + experimental-features=['scale-monitor-framebuffer'] + ''; }; gnome = { diff --git a/nixosModules/kdeconnect.nix b/nixosModules/kdeconnect.nix index 16b669f..1a3c2f1 100644 --- a/nixosModules/kdeconnect.nix +++ b/nixosModules/kdeconnect.nix @@ -31,7 +31,7 @@ ]; } - (lib.mkIf config.services.xserver.desktopManager.gnome.enable { + (lib.mkIf config.services.desktopManager.gnome.enable { # replace kdeconnect with gsconnect programs.kdeconnect.package = pkgs.gnomeExtensions.gsconnect; diff --git a/nixosModules/modern-desktop.nix b/nixosModules/modern-desktop.nix index f1879bd..6f3ccac 100644 --- a/nixosModules/modern-desktop.nix +++ b/nixosModules/modern-desktop.nix @@ -28,9 +28,7 @@ services.NetworkManager-wait-online.enable = false; # prevent stuck units from preventing shutdown (default is 120s) - extraConfig = '' - DefaultTimeoutStopSec=10s - ''; + settings.Manager.DefaultTimeoutStopSec = "10s"; }; programs = { diff --git a/nixosModules/wine-gaming.nix b/nixosModules/wine-gaming.nix index 2b9cb51..8411114 100644 --- a/nixosModules/wine-gaming.nix +++ b/nixosModules/wine-gaming.nix @@ -17,6 +17,6 @@ dxvk mangohud vulkan-tools - glxinfo + mesa-demos ]; }