summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/default.nix2
-rw-r--r--common/home/programs/nixvim/default.nix2
-rw-r--r--common/home/programs/zsh/default.nix2
-rw-r--r--common/home/services/gpg-agent/default.nix2
-rw-r--r--common/services/greetd.nix7
-rw-r--r--flake.lock180
-rw-r--r--flake.nix6
-rw-r--r--hosts/nixedo/default.nix2
8 files changed, 34 insertions, 169 deletions
diff --git a/common/default.nix b/common/default.nix
index 37804b9..28526e8 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -15,7 +15,7 @@
wofi-pass.nixosModules.default
];
- fonts.packages = with pkgs; [ nerdfonts ];
+ fonts.packages = with pkgs; [ nerd-fonts.sauce-code-pro ];
networking.networkmanager.enable = true;
diff --git a/common/home/programs/nixvim/default.nix b/common/home/programs/nixvim/default.nix
index 40af397..7bf5ca8 100644
--- a/common/home/programs/nixvim/default.nix
+++ b/common/home/programs/nixvim/default.nix
@@ -28,7 +28,7 @@
})
'';
- diagnostics = {
+ diagnostic.settings = {
virtual_text = {
prefix = "󰬨";
};
diff --git a/common/home/programs/zsh/default.nix b/common/home/programs/zsh/default.nix
index 015d26a..171e430 100644
--- a/common/home/programs/zsh/default.nix
+++ b/common/home/programs/zsh/default.nix
@@ -8,7 +8,7 @@
shellAliases = {
v = "nvim";
};
- initExtra = ''
+ initContent = ''
export MANPAGER="sh -c 'col -bx | bat -l man -p'"
export MANROFFOPT="-c"
diff --git a/common/home/services/gpg-agent/default.nix b/common/home/services/gpg-agent/default.nix
index 8fa94e7..14b0576 100644
--- a/common/home/services/gpg-agent/default.nix
+++ b/common/home/services/gpg-agent/default.nix
@@ -1,7 +1,7 @@
{ pkgs, ... }:
{
enable = true;
- pinentryPackage = pkgs.pinentry-qt;
+ pinentry.package = pkgs.pinentry-qt;
maxCacheTtl = 60480000;
maxCacheTtlSsh = 60480000;
defaultCacheTtl = 60480000;
diff --git a/common/services/greetd.nix b/common/services/greetd.nix
index 2a59cbc..41eb7ad 100644
--- a/common/services/greetd.nix
+++ b/common/services/greetd.nix
@@ -1,13 +1,16 @@
{ pkgs, ... }:
+let
+ session = "${pkgs.hyprland}/bin/Hyprland";
+in
{
enable = true;
settings = {
initial_session = {
- command = "${pkgs.hyprland}/bin/Hyprland";
+ command = session;
user = "n8";
};
default_session = {
- command = "${pkgs.greetd.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd ${pkgs.hyprland}/bin/Hyprland";
+ command = "${pkgs.greetd.tuigreet}/bin/tuigreet --greeting 'Welcome to NixOS!' --asterisks --remember --remember-user-session --time --cmd ${session}";
user = "greeter";
};
};
diff --git a/flake.lock b/flake.lock
index 90d3819..fed2d4e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,40 +1,5 @@
{
"nodes": {
- "devshell": {
- "inputs": {
- "nixpkgs": [
- "nixvim",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1741473158,
- "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
- "owner": "numtide",
- "repo": "devshell",
- "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "devshell",
- "type": "github"
- }
- },
- "flake-compat": {
- "locked": {
- "lastModified": 1733328505,
- "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
- "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
- "revCount": 69,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -74,54 +39,6 @@
"type": "github"
}
},
- "git-hooks": {
- "inputs": {
- "flake-compat": [
- "nixvim",
- "flake-compat"
- ],
- "gitignore": "gitignore",
- "nixpkgs": [
- "nixvim",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1742649964,
- "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "git-hooks.nix",
- "type": "github"
- }
- },
- "gitignore": {
- "inputs": {
- "nixpkgs": [
- "nixvim",
- "git-hooks",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1709087332,
- "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -129,38 +46,16 @@
]
},
"locked": {
- "lastModified": 1746171682,
- "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "50eee705bbdbac942074a8c120e8194185633675",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "release-24.11",
- "repo": "home-manager",
- "type": "github"
- }
- },
- "home-manager_2": {
- "inputs": {
- "nixpkgs": [
- "nixvim",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1744743431,
- "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
+ "lastModified": 1748226808,
+ "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
+ "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-24.11",
+ "ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
@@ -193,40 +88,18 @@
"type": "github"
}
},
- "nix-darwin": {
- "inputs": {
- "nixpkgs": [
- "nixvim",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1743127615,
- "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
- "owner": "lnl7",
- "repo": "nix-darwin",
- "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
- "type": "github"
- },
- "original": {
- "owner": "lnl7",
- "ref": "nix-darwin-24.11",
- "repo": "nix-darwin",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
- "lastModified": 1746557022,
- "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
+ "lastModified": 1748162331,
+ "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
+ "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-24.11",
+ "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -249,29 +122,24 @@
},
"nixvim": {
"inputs": {
- "devshell": "devshell",
- "flake-compat": "flake-compat",
"flake-parts": "flake-parts",
- "git-hooks": "git-hooks",
- "home-manager": "home-manager_2",
- "nix-darwin": "nix-darwin",
"nixpkgs": [
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch",
- "treefmt-nix": "treefmt-nix"
+ "systems": "systems_2"
},
"locked": {
- "lastModified": 1745963276,
- "narHash": "sha256-MpLljx/1dGnBIQlUswaUz/ZeOp44R3ngc1iBf4tyzyc=",
+ "lastModified": 1748197635,
+ "narHash": "sha256-1bGQAkqnGyov/tfiJw1HTK3vTHrgEo977J6RfjqrH0s=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "5bef8e43ce16ee704c7b9fa9f48a07ce81c5c05d",
+ "rev": "cfea16cdbe4f13b5d39dfe3df747092448252c9d",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "nixos-24.11",
+ "ref": "nixos-25.05",
"repo": "nixvim",
"type": "github"
}
@@ -324,24 +192,18 @@
"type": "github"
}
},
- "treefmt-nix": {
- "inputs": {
- "nixpkgs": [
- "nixvim",
- "nixpkgs"
- ]
- },
+ "systems_2": {
"locked": {
- "lastModified": 1744961264,
- "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
- "owner": "numtide",
- "repo": "treefmt-nix",
- "rev": "8d404a69efe76146368885110f29a2ca3700bee6",
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
- "owner": "numtide",
- "repo": "treefmt-nix",
+ "owner": "nix-systems",
+ "repo": "default",
"type": "github"
}
},
diff --git a/flake.nix b/flake.nix
index 408e1d4..3524783 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,14 @@
description = "n8 NixOS Configuration Flake";
inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
- url = "github:/nix-community/home-manager/release-24.11";
+ url = "github:/nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
- url = "github:/nix-community/nixvim/nixos-24.11";
+ url = "github:/nix-community/nixvim/nixos-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
webtray = {
diff --git a/hosts/nixedo/default.nix b/hosts/nixedo/default.nix
index 3bf358c..68898bc 100644
--- a/hosts/nixedo/default.nix
+++ b/hosts/nixedo/default.nix
@@ -63,7 +63,7 @@
keyname = "n8-tuxedo";
};
- networking.networkmanager.fccUnlockScripts = [
+ networking.modemmanager.fccUnlockScripts = [
{
id = "105b:e0ab";
path = "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/105b:e0ab";
generated by cgit v1.2.3-70-g09d2 (git 2.53.0) at 2026-05-12 17:03:20 +0000