update to 25.11
This commit is contained in:
parent
2be1888f5f
commit
8c5cc69618
183
flake.lock
183
flake.lock
|
|
@ -74,11 +74,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766913191,
|
||||
"narHash": "sha256-b49Rc4sXKRQuOOXhHe9vKGtDq838JLK6TWg32sfe9l0=",
|
||||
"lastModified": 1766999937,
|
||||
"narHash": "sha256-6i70XTCnVNkpT3jzWNeZH53FkSsaXOyQm57H+q5GqT8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "06aff49e740b92bcd7dd73dd67d811997452f69b",
|
||||
"rev": "a9925832734736ec80f9fb86c170569a72c8976b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -104,6 +104,27 @@
|
|||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nordvpn-flake",
|
||||
"hercules-ci-effects",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754487366,
|
||||
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "flake-parts",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nur",
|
||||
|
|
@ -124,6 +145,43 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hercules-ci-effects": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758022363,
|
||||
"narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"rev": "1a3667d33e247ad35ca250698d63f49a5453d824",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -131,15 +189,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766881808,
|
||||
"narHash": "sha256-JR7A2xS3EBPWFeONzhqez5vp7nKEsp7eLj2Ks210Srk=",
|
||||
"lastModified": 1766939458,
|
||||
"narHash": "sha256-VvZeAKyB3vhyHStSO8ACKzWRKNQPmVWktjfuSVdvtUA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d2e0458d6531885600b346e161c38790dc356fa8",
|
||||
"rev": "e298a148013c980e3c8c0ac075295fab5074d643",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -198,11 +257,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1766651565,
|
||||
"narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
|
||||
"lastModified": 1766902085,
|
||||
"narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
|
||||
"rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -262,27 +321,43 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1766687554,
|
||||
"narHash": "sha256-DegN7KD/EtFSKXf2jvqL6lvev6GlfAAatYBcRC8goEo=",
|
||||
"lastModified": 1766736597,
|
||||
"narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fd0ca39c92fdb4012ed8d60e1683c26fddadd136",
|
||||
"rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1766651565,
|
||||
"narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
|
||||
"lastModified": 1755027561,
|
||||
"narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "005433b926e16227259a1843015b5b2b7f7d1fc3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1766902085,
|
||||
"narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
|
||||
"rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -292,17 +367,65 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"nordvpn-amd64-deb": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-AfVDD/9ASErvgcG590/O+l7jeIeAv+PQkOvkRX8wC7I=",
|
||||
"type": "file",
|
||||
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_amd64.deb"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_amd64.deb"
|
||||
}
|
||||
},
|
||||
"nordvpn-arm64-deb": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"narHash": "sha256-YweSq0QV+rMNWvvWw6RN0XbsvGeZVIUlJo3z+l+f79w=",
|
||||
"type": "file",
|
||||
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_arm64.deb"
|
||||
},
|
||||
"original": {
|
||||
"type": "file",
|
||||
"url": "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_4.2.0_arm64.deb"
|
||||
}
|
||||
},
|
||||
"nordvpn-flake": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
"flake-utils": "flake-utils",
|
||||
"hercules-ci-effects": "hercules-ci-effects",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nordvpn-amd64-deb": "nordvpn-amd64-deb",
|
||||
"nordvpn-arm64-deb": "nordvpn-arm64-deb"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766934966,
|
||||
"narHash": "sha256-aDfK7EjKNI7hL/yPLrOXMCdVigcAK2JR/pHb7bJfViE=",
|
||||
"lastModified": 1764175314,
|
||||
"narHash": "sha256-fe3+VYJb5poUyrlyLe9GCgTggkxPo/JvXZ4EGroIY10=",
|
||||
"owner": "connerohnesorge",
|
||||
"repo": "nordvpn-flake",
|
||||
"rev": "97d3e39957c207af6b732f2b290763404041f36e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "connerohnesorge",
|
||||
"repo": "nordvpn-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767001212,
|
||||
"narHash": "sha256-DRntVoOGpUeo3+Axv4AH1SIxnHLFDNqDIpwaLCFPnkU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "1bab97d6a7699c468813a7158a1130bb68fbd83b",
|
||||
"rev": "d9a526e606131c3bb75b32a0f46c778911ca7db8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -333,6 +456,7 @@
|
|||
"nixos-wsl": "nixos-wsl",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nordvpn-flake": "nordvpn-flake",
|
||||
"nur": "nur"
|
||||
}
|
||||
},
|
||||
|
|
@ -452,6 +576,21 @@
|
|||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
|
|
@ -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/nixos-unstable";
|
||||
nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
disko = {
|
||||
|
|
@ -18,9 +18,11 @@
|
|||
};
|
||||
apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
|
||||
duralumin.url = "git+https://git.nirgendwo.xyz/janis/duralumin.git";
|
||||
nordvpn-flake.url = "github:connerohnesorge/nordvpn-flake";
|
||||
nordvpn-flake.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = inputs @ { self, disko, nixpkgs, nixos-wsl, nixpkgs-unstable, home-manager, duralumin, emacs-overlay, ... }:
|
||||
outputs = inputs @ { disko, nixpkgs, nixos-wsl, nixpkgs-unstable, home-manager, duralumin, emacs-overlay, nordvpn-flake, ... }:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
overlay-unstable = final: prev: {
|
||||
|
|
@ -40,6 +42,7 @@
|
|||
./pkgs
|
||||
host
|
||||
home-manager.nixosModules.home-manager
|
||||
nordvpn-flake.nixosModules.default
|
||||
disko.nixosModules.disko
|
||||
{
|
||||
home-manager.useGlobalPkgs = true; # Use global packages in home-manager
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ in {
|
|||
fonts.fontconfig.enable = true;
|
||||
|
||||
home = {
|
||||
stateVersion = "25.05";
|
||||
stateVersion = "25.11";
|
||||
homeDirectory = "/home/${user.username}";
|
||||
username = user.username;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ in {
|
|||
libvterm-neovim # vterm support for Emacs
|
||||
nodejs_24
|
||||
copilot-node-server
|
||||
copilot-language-server-fhs
|
||||
copilot-language-server
|
||||
cmake
|
||||
libtool
|
||||
gnumake
|
||||
|
|
|
|||
|
|
@ -1,15 +1,12 @@
|
|||
{pkgs, ...}: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "janis";
|
||||
userEmail = "janis@nirgendwo.xyz";
|
||||
settings = {
|
||||
user = {
|
||||
name = "janis";
|
||||
email = "janis@nirgendwo.xyz";
|
||||
};
|
||||
|
||||
signing = {
|
||||
format = "ssh";
|
||||
key = "~/.ssh/duralumin_janis-github";
|
||||
};
|
||||
|
||||
extraConfig = {
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
|
|
@ -20,6 +17,11 @@
|
|||
gpgsign = "true";
|
||||
};
|
||||
};
|
||||
|
||||
signing = {
|
||||
format = "ssh";
|
||||
key = "~/.ssh/duralumin_janis-github";
|
||||
};
|
||||
};
|
||||
|
||||
programs.ssh = {
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ configuration {
|
|||
'';
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi-wayland;
|
||||
package = pkgs.rofi;
|
||||
terminal = "{pkgs.alacritty}/bin/alacritty";
|
||||
|
||||
theme = "spotlight.rasi";
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ in {
|
|||
wmctrl
|
||||
alsa-utils
|
||||
wireplumber
|
||||
rofi-wayland
|
||||
rofi
|
||||
|
||||
alacritty
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{writeShellApplication, dotfiles, bash, jq, rofi, nordvpn, coreutils, ...}:
|
||||
{writeShellApplication, dotfiles, bash, jq, rofi, coreutils, ...}:
|
||||
writeShellApplication {
|
||||
name = "nordvpn-rofi";
|
||||
|
||||
runtimeInputs = [ jq rofi nordvpn coreutils bash ];
|
||||
runtimeInputs = [ jq rofi coreutils bash ];
|
||||
|
||||
# shellcheck errors or warnings that should be ignored:
|
||||
excludeShellChecks = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./nordvpn.nix
|
||||
# ./nordvpn.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
];
|
||||
|
||||
system = {
|
||||
stateVersion = "25.05";
|
||||
stateVersion = "25.11";
|
||||
activationScripts = {
|
||||
rfkill-unblock = {
|
||||
text = ''
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
packages = with pkgs; [
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
liberation_ttf
|
||||
roboto
|
||||
roboto-mono
|
||||
|
|
|
|||
|
|
@ -16,6 +16,11 @@
|
|||
};
|
||||
};
|
||||
|
||||
services.nordvpn = {
|
||||
enable = true;
|
||||
users = [ "user" ];
|
||||
};
|
||||
|
||||
services.resolved = {
|
||||
enable = true;
|
||||
dnssec = "true";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd 'dbus-run-session sway'";
|
||||
command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd 'dbus-run-session sway'";
|
||||
user = "greeter";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue