summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradikro <adikro@disroot.org>2026-05-13 00:01:14 +0200
committeradikro <adikro@disroot.org>2026-05-13 00:01:14 +0200
commit31c293d72740180ca1272c76e96a1c6c87b9e195 (patch)
treefc1fbebbb1ead9175b613a6f1725e1654cebb164
parent1b67275b854235fa1f8c8fc68fff1beae9515a0f (diff)
i forgot
-rw-r--r--flake.lock115
-rw-r--r--flake.nix13
-rw-r--r--hm/soft/mpv.nix2
-rw-r--r--hosts/desktop/configuration.nix74
-rw-r--r--hosts/desktop/home.nix2
-rw-r--r--os/core/greet.nix2
-rw-r--r--os/srv/gaming.nix6
7 files changed, 111 insertions, 103 deletions
diff --git a/flake.lock b/flake.lock
index e44ffd2..7ffce04 100644
--- a/flake.lock
+++ b/flake.lock
@@ -212,11 +212,11 @@
]
},
"locked": {
- "lastModified": 1777932387,
- "narHash": "sha256-nUYVPiqrzr36ThiQOAr5MKeGHDBSDM3OFWkz0uDjOvc=",
+ "lastModified": 1777988971,
+ "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "71a3a77326609675e9f8b51084cf23d5d1945899",
+ "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"type": "github"
},
"original": {
@@ -363,11 +363,11 @@
]
},
"locked": {
- "lastModified": 1778271343,
- "narHash": "sha256-K1j+PHOkH21qlw0MfxZx23i2jUeRpuv3hdrXyUXyBZ8=",
+ "lastModified": 1778616473,
+ "narHash": "sha256-g4LWJrY62VJ0qN/n+eoPt3uL7b4fLtGoDAT86I9jbco=",
"owner": "Mjoyufull",
"repo": "fsel",
- "rev": "8ebaea09f0ec25fa940aefc3adad07f45909c289",
+ "rev": "3320d306e67354d300ab64aced96a6b9e2722917",
"type": "github"
},
"original": {
@@ -383,11 +383,11 @@
]
},
"locked": {
- "lastModified": 1778444552,
- "narHash": "sha256-f18pIiR9q/p1vHY93gmAum7aHhQOG49oGvAB9+lptRo=",
+ "lastModified": 1778609305,
+ "narHash": "sha256-muTc+WME6k3sfTr/Pvmw8hrK7zXrbl961TEF9wPeAnk=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "dcebe66f958673729896eec2de4abfd86ef22d21",
+ "rev": "5878fdadfe2cfe1b3383b38d66117f7b80696b68",
"type": "github"
},
"original": {
@@ -511,11 +511,11 @@
"spectrum": "spectrum"
},
"locked": {
- "lastModified": 1778369133,
- "narHash": "sha256-zfYJAAVau1dDlVo8PfA0oQFVwvRjpp8Zz+T61+ywogI=",
+ "lastModified": 1778505275,
+ "narHash": "sha256-NUBO+o/ZasfzS/oB4pFLXWQa9Oc/Uoz6qWpSWMb/GUk=",
"owner": "microvm-nix",
"repo": "microvm.nix",
- "rev": "9ddb425679d44e6e1e5cd5df9db0c42ed99df4a4",
+ "rev": "dae3578b2bc38722430f0e586e07f57385b52ef8",
"type": "github"
},
"original": {
@@ -712,11 +712,11 @@
]
},
"locked": {
- "lastModified": 1778457890,
- "narHash": "sha256-U7gud2OEN/TMnWB0FIzh3y3i584/Fih2UBYBh0/HrF0=",
+ "lastModified": 1778544287,
+ "narHash": "sha256-tC3tWvtDYu3ToKShV0sUA/CgfwANRLGdVltUhqpswbc=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "ab8bfc87bc703c32519c648ae50250be73d22d70",
+ "rev": "1e7087c03f0fb1935f73bd28ba044714cfab34f4",
"type": "github"
},
"original": {
@@ -728,11 +728,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1778437351,
- "narHash": "sha256-3JxUYjRlAeR6WGbe4nInkHXYljiEz5wemLssxKX+sQQ=",
+ "lastModified": 1778543564,
+ "narHash": "sha256-14IEUOs5RbA1AVeTVmhJTkttLmsxhAkEkv8Q8PESMR0=",
"owner": "neovim",
"repo": "neovim",
- "rev": "5370eb01469622e02c5831b3c4063c02449a4c5c",
+ "rev": "492b8c9e9c7699a7158db407dfc7c24579fedb1e",
"type": "github"
},
"original": {
@@ -753,11 +753,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1778392415,
- "narHash": "sha256-UbEC8dOIWwCG4mww7SGhYMgM1yi8ewgKLi8O3uhX33M=",
+ "lastModified": 1778600236,
+ "narHash": "sha256-jWlIT+uKqKZoz6rNweobs/h6FfI5dKnC5OO7/3T7Tdw=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "670859bacca122ec1158c882b4cf2828930b3669",
+ "rev": "f525d3b0a684d463dc9cf5c59359b9e67a372939",
"type": "github"
},
"original": {
@@ -822,11 +822,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1778143761,
- "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=",
+ "lastModified": 1778593042,
+ "narHash": "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871",
+ "rev": "9bd7c80d43e258aaa607d83b43661df11444d808",
"type": "github"
},
"original": {
@@ -867,13 +867,29 @@
"type": "github"
}
},
+ "nixpkgs-master": {
+ "locked": {
+ "lastModified": 1778622600,
+ "narHash": "sha256-5kefHGtDg1zOtFTnaOBUbz8z7IefPQ6IdtjgDmlcqAg=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "83b67ce288b942d6e1253075303a5decd7a0b00b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "master",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixpkgs-stable": {
"locked": {
- "lastModified": 1778003029,
- "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
+ "lastModified": 1778430510,
+ "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
+ "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575",
"type": "github"
},
"original": {
@@ -885,11 +901,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1778003029,
- "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
+ "lastModified": 1778430510,
+ "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
+ "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575",
"type": "github"
},
"original": {
@@ -901,11 +917,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1777954456,
- "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+ "lastModified": 1778443072,
+ "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+ "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
"type": "github"
},
"original": {
@@ -940,11 +956,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1777991353,
- "narHash": "sha256-DFwjggMV+nzCZpwK6Obxj9F+P59rbLVowGqHETfctBk=",
+ "lastModified": 1778510615,
+ "narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "7986a276960b4dfaed9bb2c3c438b5ba71ae08f1",
+ "rev": "fa8cd368d27cf9541f086485884928315abdcc8c",
"type": "github"
},
"original": {
@@ -965,11 +981,11 @@
"systems": "systems_3"
},
"locked": {
- "lastModified": 1778408907,
- "narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=",
+ "lastModified": 1778618635,
+ "narHash": "sha256-eiZkwksjBS4yr5uPt9rzoEQrnuwTgmFVFb6glGrNGF4=",
"owner": "NotAShelf",
"repo": "nvf",
- "rev": "e86a92e4b29b499e5f1285b737b7612115103da9",
+ "rev": "0f7a1ff6ecff4a1f4fa2bbdd0f42151706a26831",
"type": "github"
},
"original": {
@@ -986,11 +1002,11 @@
]
},
"locked": {
- "lastModified": 1777508256,
- "narHash": "sha256-K+tTlkGEruE/LrGpykxa7yaDg3Z6V+Tmo6YprUMSzKg=",
+ "lastModified": 1778546173,
+ "narHash": "sha256-nhSXc+jaOYlDGr5beX+LMcw0BeA5SdWH28aCrV1QMPg=",
"ref": "refs/heads/master",
- "rev": "a9db276fd872951769451142137a5e0f88ed15bc",
- "revCount": 122,
+ "rev": "24f9909badd4e7aa1f3aeef717b93e9b71c20a4e",
+ "revCount": 123,
"shallow": false,
"type": "git",
"url": "https://git.bwaaa.monster/omnisearch"
@@ -1075,6 +1091,7 @@
"nix-gaming-edge": "nix-gaming-edge",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
+ "nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable_2",
"nixvim": "nixvim",
"nvf": "nvf",
@@ -1249,11 +1266,11 @@
"systems": "systems_6"
},
"locked": {
- "lastModified": 1778395012,
- "narHash": "sha256-A/VRiNFQIwGp8cOC/8yNCRexFHjtFCzBwhajrkyGojo=",
+ "lastModified": 1778540809,
+ "narHash": "sha256-FNXls2QZTcxY0Dem3QtSewnr8vUKMDsTw9m8pLOnhTc=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
- "rev": "3b4991bfc064c3361957f23141351ae2d9833234",
+ "rev": "83939d7df4c0f1b8ee88cabde112223280a48554",
"type": "github"
},
"original": {
@@ -1447,11 +1464,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
- "lastModified": 1778345877,
- "narHash": "sha256-wunFw3vId/JP0bkdF7F7i2xuJwSH/wBLOx6rNvHXI/0=",
+ "lastModified": 1778523128,
+ "narHash": "sha256-eQp81Z0jSjD3wA8fFrmgxiS7Ahwf1M/mwaKWoI6iY5c=",
"owner": "sxyazi",
"repo": "yazi",
- "rev": "247f925e532236aa4e0dc6ac1a3e0a0263083ce6",
+ "rev": "fde563380b45f19da10221e07d5415836313c743",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 6572bf7..f9a5a05 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11";
+ nixpkgs-master.url = "github:nixos/nixpkgs/master";
# Hardware and gaming
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@@ -103,16 +104,18 @@
self,
nixpkgs,
nixpkgs-stable,
+ nixpkgs-master,
...
}@inputs:
let
unstablePkgs = import nixpkgs { };
stablePkgs = import nixpkgs-stable {
system = "x86_64-linux";
- config = {
- allowUnfree = true;
- permittedInsecurePackages = [ "netbox-4.3.7" ];
- };
+ config.allowUnfree = true;
+ };
+ masterPkgs = import nixpkgs-master {
+ system = "x86_64-linux";
+ config.allowUnfree = true;
};
mkHost =
{
@@ -127,6 +130,7 @@
username = user;
pkgs-unstable = unstablePkgs;
pkgs-stable = stablePkgs;
+ pkgs-master = masterPkgs;
};
modules = [
path
@@ -140,7 +144,6 @@
hostname = "szpont";
path = ./hosts/desktop/configuration.nix;
};
- laptop = mkHost { hostname = "laptop"; };
thinkpad = mkHost { hostname = "thinkpad"; };
pendrive = mkHost {
hostname = "pendrive";
diff --git a/hm/soft/mpv.nix b/hm/soft/mpv.nix
index 848c344..b2c0ab8 100644
--- a/hm/soft/mpv.nix
+++ b/hm/soft/mpv.nix
@@ -32,7 +32,7 @@ in
mpris
mpv-image-viewer.image-positioning
- (pkgs.mpvScripts.builtins.autoload)
+ # (pkgs.mpvScripts.builtins.autoload)
mpv-cheatsheet-ng
webtorrent-mpv-hook
autosubsync-mpv
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 2458dec..2bc4826 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -1,8 +1,7 @@
{
config,
username,
- pkgs-stable,
- pkgs,
+ pkgs-master,
...
}:
{
@@ -53,7 +52,7 @@
security = {
enable = true;
sandboxing.enable = true;
- antivirus.enable = true;
+ # antivirus.enable = true;
};
ssh.enable = true;
tailscale.enable = true;
@@ -97,9 +96,6 @@
};
};
- environment.systemPackages = with pkgs; [
- openmw
- ];
boot = {
kernelModules = [
"nct6687"
@@ -111,40 +107,38 @@
];
};
- boot.kernelParams = [
- "split_lock_detect=off"
- "amdgpu.ppfeaturemask=0xffffffff"
- "preempt=full"
+ environment.systemPackages = [
+ pkgs-master.simplex-chat-desktop
];
- services.netbox = {
- enable = true;
- package = pkgs-stable.netbox;
- secretKeyFile = "/var/lib/netbox/key";
- apiTokenPeppersFile = "/var/lib/netbox/api-pepper";
-
- settings = {
- ALLOWED_HOSTS = [
- "localhost"
- "127.0.0.1"
- "[::1]"
- ];
- };
- };
-
- services.nginx = {
- enable = true;
- user = "netbox";
- recommendedProxySettings = true;
- virtualHosts.localhost = {
- locations = {
- "/" = {
- proxyPass = "http://[::1]:8001";
- };
- "/static/" = {
- alias = "${config.services.netbox.dataDir}/static/";
- };
- };
- };
- };
+ # services.netbox = {
+ # enable = true;
+ # package = pkgs-stable.netbox;
+ # secretKeyFile = "/var/lib/netbox/key";
+ # apiTokenPeppersFile = "/var/lib/netbox/api-pepper";
+ #
+ # settings = {
+ # ALLOWED_HOSTS = [
+ # "localhost"
+ # "127.0.0.1"
+ # "[::1]"
+ # ];
+ # };
+ # };
+ #
+ # services.nginx = {
+ # enable = true;
+ # user = "netbox";
+ # recommendedProxySettings = true;
+ # virtualHosts.localhost = {
+ # locations = {
+ # "/" = {
+ # proxyPass = "http://[::1]:8001";
+ # };
+ # "/static/" = {
+ # alias = "${config.services.netbox.dataDir}/static/";
+ # };
+ # };
+ # };
+ # };
}
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 58714f0..da433d6 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -90,6 +90,8 @@
};
home.packages = with pkgs; [
+ tmux
+ gimp
stow
element-desktop
];
diff --git a/os/core/greet.nix b/os/core/greet.nix
index cf814af..67457e3 100644
--- a/os/core/greet.nix
+++ b/os/core/greet.nix
@@ -28,7 +28,5 @@ in
};
};
security.pam.services.greetd.enableGnomeKeyring = true;
-
- # environment.systemPackages = with pkgs; [ tuigreet ];
};
}
diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index 8de887b..05908f3 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -3,7 +3,6 @@
lib,
pkgs,
username,
- inputs,
...
}:
let
@@ -37,11 +36,6 @@ in
enableRenice = true;
settings = {
general.renice = 10;
- # gpu = {
- # apply_gpu_optimisations = "accept-responsibility";
- # gpu_device = 0;
- # amd_performance_level = "high";
- # };
};
};