diff --git a/flake.lock b/flake.lock
index b3584cc..26fa4c7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,70 +1,5 @@
{
"nodes": {
- "dank-material-shell": {
- "inputs": {
- "dgop": "dgop",
- "dms-cli": "dms-cli",
- "nixpkgs": [
- "nixpkgs"
- ],
- "quickshell": "quickshell"
- },
- "locked": {
- "lastModified": 1760932218,
- "narHash": "sha256-3vnrrQZPfQuHEzowGB4e7vL5EpTHf5oyzyOS1aKfnig=",
- "owner": "AvengeMedia",
- "repo": "DankMaterialShell",
- "rev": "851d47213cb639a92b9e0dd545e2aa163f12b701",
- "type": "github"
- },
- "original": {
- "owner": "AvengeMedia",
- "repo": "DankMaterialShell",
- "type": "github"
- }
- },
- "dgop": {
- "inputs": {
- "nixpkgs": [
- "dank-material-shell",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1760238269,
- "narHash": "sha256-7CeGZM/Z/5Qt3AYByCRohGYGR1MRuXYzTTbkV/JxyAs=",
- "owner": "AvengeMedia",
- "repo": "dgop",
- "rev": "95acdfce2d323e28fa8f5a4f345160962034f2b5",
- "type": "github"
- },
- "original": {
- "owner": "AvengeMedia",
- "repo": "dgop",
- "type": "github"
- }
- },
- "dms-cli": {
- "inputs": {
- "nixpkgs": [
- "dank-material-shell",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1760241259,
- "narHash": "sha256-DlLGn+4M6tIafoDsHr2WhHG2hrHrC24S2IL3+KAvjEU=",
- "owner": "AvengeMedia",
- "repo": "danklinux",
- "rev": "dae4c3ff4ce0feb930361c399747edb29d081775",
- "type": "github"
- },
- "original": {
- "owner": "AvengeMedia",
- "repo": "danklinux",
- "type": "github"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -73,11 +8,11 @@
]
},
"locked": {
- "lastModified": 1759362264,
- "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+ "lastModified": 1762040540,
+ "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+ "rev": "0010412d62a25d959151790968765a70c436598b",
"type": "github"
},
"original": {
@@ -88,7 +23,7 @@
},
"flake-utils": {
"inputs": {
- "systems": "systems"
+ "systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
@@ -104,39 +39,6 @@
"type": "github"
}
},
- "flake-utils_2": {
- "inputs": {
- "systems": "systems_3"
- },
- "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"
- }
- },
- "flakey-profile": {
- "locked": {
- "lastModified": 1712898590,
- "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
- "owner": "lf-",
- "repo": "flakey-profile",
- "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
- "type": "github"
- },
- "original": {
- "owner": "lf-",
- "repo": "flakey-profile",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -144,11 +46,11 @@
]
},
"locked": {
- "lastModified": 1760929667,
- "narHash": "sha256-nZh6uvc71nVNaf/y+wesnjwsmJ6IZZUnP2EzpZe48To=",
+ "lastModified": 1762463325,
+ "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "189c21cf879669008ccf06e78a553f17e88d8ef0",
+ "rev": "0562fef070a1027325dd4ea10813d64d2c967b39",
"type": "github"
},
"original": {
@@ -185,47 +87,12 @@
"type": "github"
}
},
- "lix": {
- "flake": false,
- "locked": {
- "lastModified": 1753306924,
- "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=",
- "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77",
- "type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77"
- },
- "original": {
- "type": "tarball",
- "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz"
- }
- },
- "lix-module": {
- "inputs": {
- "flake-utils": "flake-utils",
- "flakey-profile": "flakey-profile",
- "lix": "lix",
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1756125859,
- "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=",
- "rev": "d3292125035b04df00d01549a26e948631fabe1e",
- "type": "tarball",
- "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d3292125035b04df00d01549a26e948631fabe1e.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-2.tar.gz"
- }
- },
"matugen": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
- "systems": "systems_2"
+ "systems": "systems"
},
"locked": {
"lastModified": 1731508795,
@@ -254,11 +121,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1760950171,
- "narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=",
+ "lastModified": 1762499019,
+ "narHash": "sha256-debiIeLJUOxMc0G/cADieAVehxafd7OwyVyyG2Q8XIg=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "f851a923137c0a54719412146fd63d24b3214e60",
+ "rev": "f4f31ea5bfa24325f4ac34a528937ee1b83e6869",
"type": "github"
},
"original": {
@@ -287,11 +154,11 @@
"niri-unstable": {
"flake": false,
"locked": {
- "lastModified": 1760940149,
- "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=",
+ "lastModified": 1762492604,
+ "narHash": "sha256-cjXYF5+gGaapr6d1Jz70GZQVzK4qzwDUwU86p9+H2mM=",
"owner": "YaLTeR",
"repo": "niri",
- "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5",
+ "rev": "2144f9a6ae7b675213f9bd86d0989c334baa1c00",
"type": "github"
},
"original": {
@@ -318,11 +185,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1760878510,
- "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
+ "lastModified": 1762363567,
+ "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
+ "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
"type": "github"
},
"original": {
@@ -334,11 +201,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1760862643,
- "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
+ "lastModified": 1762233356,
+ "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
+ "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8",
"type": "github"
},
"original": {
@@ -355,14 +222,14 @@
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch",
- "systems": "systems_4"
+ "systems": "systems_3"
},
"locked": {
- "lastModified": 1760960598,
- "narHash": "sha256-UP1v+sEkHuvD2+qyhxbkQpBR+dl9U0ljml3/dMI2jeU=",
+ "lastModified": 1762473729,
+ "narHash": "sha256-0mKCvL4MUuraS3dVFgRETOM96t0n68J851gZ0HK8U1k=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "e3b77e803b2350b72f4d72c8f175ab0fbfe5a642",
+ "rev": "f0dceb449af35c83a0e2bf23c71f50fc61aff42f",
"type": "github"
},
"original": {
@@ -373,7 +240,7 @@
},
"nuschtosSearch": {
"inputs": {
- "flake-utils": "flake-utils_2",
+ "flake-utils": "flake-utils",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
@@ -381,11 +248,11 @@
]
},
"locked": {
- "lastModified": 1758662783,
- "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
+ "lastModified": 1761730856,
+ "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
"owner": "NuschtOS",
"repo": "search",
- "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
+ "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
"type": "github"
},
"original": {
@@ -394,32 +261,9 @@
"type": "github"
}
},
- "quickshell": {
- "inputs": {
- "nixpkgs": [
- "dank-material-shell",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1760228179,
- "narHash": "sha256-4Z6k7lv3Zcgk3K+4h60LpqB9wCkR+utkYERU735U068=",
- "ref": "refs/heads/master",
- "rev": "c9d3ffb6043c5bf3f3009202bad7e0e5132c4a25",
- "revCount": 693,
- "type": "git",
- "url": "https://git.outfoxxed.me/quickshell/quickshell"
- },
- "original": {
- "type": "git",
- "url": "https://git.outfoxxed.me/quickshell/quickshell"
- }
- },
"root": {
"inputs": {
- "dank-material-shell": "dank-material-shell",
"home-manager": "home-manager",
- "lix-module": "lix-module",
"matugen": "matugen",
"niri": "niri",
"nix-flatpak": "nix-flatpak",
@@ -428,21 +272,6 @@
}
},
"systems": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -457,7 +286,7 @@
"type": "github"
}
},
- "systems_3": {
+ "systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -472,7 +301,7 @@
"type": "github"
}
},
- "systems_4": {
+ "systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -507,11 +336,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
- "lastModified": 1759707084,
- "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=",
+ "lastModified": 1762488100,
+ "narHash": "sha256-pD8YqwP0/irHWzJtVElnVljR+OaJPAVbJBwqix+uB5A=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
- "rev": "a9188e70bd748118b4d56a529871b9de5adb9988",
+ "rev": "3cd3edffe1be197326e9314816b16bb4e3d685b1",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 9f3a697..cd928ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,6 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
- lix-module = {
- url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-2.tar.gz";
- inputs.nixpkgs.follows = "nixpkgs";
- };
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
@@ -22,10 +18,6 @@
url = "github:sodiboo/niri-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
- dank-material-shell = {
- url = "github:AvengeMedia/DankMaterialShell";
- inputs.nixpkgs.follows = "nixpkgs";
- };
};
outputs =
@@ -33,11 +25,9 @@
nixpkgs,
home-manager,
nixvim,
- lix-module,
matugen,
nix-flatpak,
niri,
- dank-material-shell,
...
}@inputs:
let
@@ -95,7 +85,6 @@
./modules/nixos
./hosts/${hostname}
home-manager.nixosModules.home-manager
- dank-material-shell.nixosModules.greeter
niri.nixosModules.niri
nix-flatpak.nixosModules.nix-flatpak
{
@@ -144,8 +133,6 @@
./overlays/matugen/hm-module.nix
nix-flatpak.homeManagerModules.nix-flatpak
nixvim.homeModules.nixvim
- dank-material-shell.homeModules.dankMaterialShell.default
- dank-material-shell.homeModules.dankMaterialShell.niri
./modules/home-manager/modules/nixvim
];
users.${username} = {
@@ -172,7 +159,7 @@
username = "theaninova";
system = "x86_64-linux";
config = {
- rocmSupport = true;
+ # rocmSupport = true;
};
};
aero = mkHost {
diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix
index bff5f09..a06dea3 100644
--- a/hosts/MONSTER/default.nix
+++ b/hosts/MONSTER/default.nix
@@ -68,7 +68,6 @@
airprint.enable = true;
udev.packages = with pkgs; [
- android-udev-rules
usb-sniffer
];
};
@@ -131,7 +130,7 @@
programs = {
zsh.enable = true;
wireshark = {
- enable = true;
+ enable = false;
package = pkgs.wireshark;
usbmon.enable = true;
};
@@ -160,6 +159,7 @@
# List packages installed in system profile. To search, run:
environment.systemPackages = with pkgs; [
# Essential utils
+ nix-output-monitor
alacritty
usbutils
usbimager
diff --git a/modules/home-manager/programs/git.nix b/modules/home-manager/programs/git.nix
index 4fbc76b..ce3c234 100644
--- a/modules/home-manager/programs/git.nix
+++ b/modules/home-manager/programs/git.nix
@@ -6,7 +6,7 @@
key = "6C9E EFC5 1AE0 0131 78DE B9C8 68FF FB1E C187 88CA";
signByDefault = true;
};
- extraConfig = {
+ settings = {
user = {
email = "dev@theaninova.de";
name = "Thea Schöbl";
diff --git a/modules/home-manager/programs/nixvim.nix b/modules/home-manager/programs/nixvim.nix
index 82dbde1..ff5b78c 100644
--- a/modules/home-manager/programs/nixvim.nix
+++ b/modules/home-manager/programs/nixvim.nix
@@ -88,6 +88,10 @@
todo-comments.enable = true;
origami.enable = false;
nvim-surround.enable = true;
+ flash = {
+ enable = true;
+ settings.modes.search.enabled = true;
+ };
treesitter-context = {
enable = false; # TODO: looks weird with Neovide
settings.line_numbers = false;
diff --git a/modules/nixos/fonts/noto-sans.nix b/modules/nixos/fonts/noto-sans.nix
index 6f544dc..bb60e42 100644
--- a/modules/nixos/fonts/noto-sans.nix
+++ b/modules/nixos/fonts/noto-sans.nix
@@ -26,7 +26,7 @@ in
[
noto-fonts
noto-fonts-cjk-sans
- noto-fonts-emoji
+ noto-fonts-color-emoji
]
++ (if (config.fonts.nerd-fonts.enable) then [ nerd-fonts.noto ] else [ ]);
fontconfig = {
diff --git a/modules/nixos/hardware/amdgpu.nix b/modules/nixos/hardware/amdgpu.nix
index aa457cd..288475f 100644
--- a/modules/nixos/hardware/amdgpu.nix
+++ b/modules/nixos/hardware/amdgpu.nix
@@ -47,7 +47,7 @@ in
environment.systemPackages = with pkgs; [
amdgpu_top
- glxinfo
+ mesa-demos
libva-utils
vulkan-tools
clinfo
diff --git a/modules/nixos/hardware/fv43u.nix b/modules/nixos/hardware/fv43u.nix
index 700c2ea..d1d3cc7 100644
--- a/modules/nixos/hardware/fv43u.nix
+++ b/modules/nixos/hardware/fv43u.nix
@@ -26,7 +26,7 @@ in
boot.kernelParams = [ "video=DP-3:3840x2160-30@144" ];
services.colord.enable = true;
environment.systemPackages = [
- (pkgs.runCommandNoCC "fv43u_icc" { } ''
+ (pkgs.runCommand "fv43u_icc" { } ''
mkdir -p $out/share/color/icc
cp ${./fv43u.icc} $out/share/color/icc/fv43u.icc
'')
diff --git a/modules/nixos/hardware/nvidia-nouveau.nix b/modules/nixos/hardware/nvidia-nouveau.nix
index 5492b1d..0fac8bb 100644
--- a/modules/nixos/hardware/nvidia-nouveau.nix
+++ b/modules/nixos/hardware/nvidia-nouveau.nix
@@ -27,7 +27,7 @@ in
};
environment.systemPackages = with pkgs; [
- glxinfo
+ mesa-demos
libva-utils
vulkan-tools
];
diff --git a/modules/nixos/hardware/nvidia-proprietary.nix b/modules/nixos/hardware/nvidia-proprietary.nix
index 8bab077..ed299a5 100644
--- a/modules/nixos/hardware/nvidia-proprietary.nix
+++ b/modules/nixos/hardware/nvidia-proprietary.nix
@@ -67,7 +67,7 @@ in
WLR_NO_HARDWARE_CURSORS = "1";
};
systemPackages = with pkgs; [
- glxinfo
+ mesa-demos
nvtopPackages.nvidia
libva-utils
vulkan-tools
diff --git a/modules/nixos/usecases/gaming.nix b/modules/nixos/usecases/gaming.nix
index b133aa0..a180d95 100644
--- a/modules/nixos/usecases/gaming.nix
+++ b/modules/nixos/usecases/gaming.nix
@@ -30,13 +30,13 @@ in
steam
oversteer
obs-studio
- (lutris.override {
+ /*(lutris.override {
extraLibraries =
pkgs: with pkgs; [
libgudev
libvdpau
];
- })
+ })*/
rpcs3
bottles
wineWow64Packages.stagingFull
diff --git a/modules/nixos/usecases/windows-vm.nix b/modules/nixos/usecases/windows-vm.nix
index 1f6541d..b3b7376 100644
--- a/modules/nixos/usecases/windows-vm.nix
+++ b/modules/nixos/usecases/windows-vm.nix
@@ -40,14 +40,13 @@ in
# /run/libvirt/nix-ovmf/edk2-x86_64-secure-code.fd
# /var/lib/libvirt/qemu/nvram/win11_VARS.fd
-
environment.systemPackages = with pkgs; [
virt-manager
virt-viewer
spice
spice-gtk
spice-protocol
- win-virtio
+ virtio-win
win-spice
adwaita-icon-theme
qemu
diff --git a/rebuild.sh b/rebuild.sh
new file mode 100755
index 0000000..70467ab
--- /dev/null
+++ b/rebuild.sh
@@ -0,0 +1 @@
+nixos-rebuild switch --flake .# --log-format internal-json -v |& nom --json