chris/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaning up and fixing

Browse Source
This commit is contained in:
chris
2026-08-16 12:36:59 +01:00
parent 7982e77c12
commit 5255ce3709
12 changed files with 34 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
-17
View File
@@ -302,22 +302,6 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1786599213,
"narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1764242076,
@@ -439,7 +423,6 @@
"nix-gaming": "nix-gaming",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6",
"nixpkgs-unstable": "nixpkgs-unstable",
"psysonic": "psysonic",
"try-cli": "try-cli",
"voxtype": "voxtype",
flake.nix
-36
View File
@@ -1,24 +1,8 @@
{
description = "Stationette nix config";
nixConfig = {
extra-substituters = [
"https://nix-gaming.cachix.org"
"https://walker.cachix.org"
"https://walker-git.cachix.org"
"https://psysonic.cachix.org"
];
extra-trusted-public-keys = [
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
"walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM="
"walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
"psysonic.cachix.org-1:M9cQyQ7tgvUWOQ5Pyt8ozlMoPLtOZir6MfRuTH9/VYA="
];
};
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nix-gaming.url = "github:fufexan/nix-gaming";
disko.url = "github:nix-community/disko/latest";
impermanence.url = "github:nix-community/impermanence";
@@ -61,15 +45,10 @@
outputs = {
self,
nixpkgs,
nixpkgs-unstable,
nix-gaming,
impermanence,
disko,
home-manager,
try-cli,
psysonic,
voxtype,
walker,
nixos-hardware,
# hyprland-preview-share-picker,
...
@@ -81,10 +60,6 @@
config.allowUnfree = true;
};
nix-gaming = inputs.nix-gaming.packages.${system};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
mkHost = hostname: nixpkgs.lib.nixosSystem {
modules = [
@@ -99,11 +74,6 @@
users.chris = import ./home;
extraSpecialArgs = {
inherit inputs;
inherit pkgs-unstable;
inherit try-cli;
inherit psysonic;
inherit voxtype;
inherit walker;
inherit impermanence;
inherit hostname;
};
@@ -112,7 +82,6 @@
];
specialArgs = {
inherit inputs;
inherit pkgs-unstable;
inherit impermanence;
inherit disko;
inherit hostname;
@@ -131,11 +100,6 @@
inherit pkgs;
extraSpecialArgs = {
inherit inputs;
inherit pkgs-unstable;
inherit try-cli;
inherit psysonic;
inherit voxtype;
inherit walker;
inherit impermanence;
};
modules = [
home/packages.nix
+9 -10
View File
@@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, try-cli, psysonic, nix-direnv, ... }:
{ pkgs, inputs, nix-direnv, ... }:
let
# krita-appimage = pkgs.callPackage ../packages/krita.nix { };
@@ -24,36 +24,35 @@ in
};
};
home.packages = with pkgs; [
pkgs-unstable.antigravity # Gemini AI coding assistant
pkgs-unstable.antigravity-cli # Gemini AI coding assistant
antigravity-ide # Gemini AI coding assistant
antigravity-cli # Gemini AI coding assistant
bluetui # Bluetooth TUI
enpass # Password manager
enpass-cli # Enpass CLI tool
expressvpn # VPN
ffmpeg # Video tools
ffmpegthumbnailer # Video thumbnailer
pkgs-unstable.gemini-cli # Gemini AI CLI tool
ghostty # Terminal emulator
gimp # Image manipulation software
gpu-screen-recorder # GPU screen recorder for Linux
imv # Image viewer
inkscape # Vector graphics software
pkgs-unstable.krita # Custom digital art software (from AppImage)
# pkgs-unstable.libation # Audible book manager
krita # Custom digital art software (from AppImage)
# libation # Audible book manager
libreoffice-fresh # Office suite
pkgs-unstable.atlauncher # Minecraft launcher
atlauncher # Minecraft launcher
mpv # Video player
nautilus # Document viewer
nextcloud-client # Nextcloud sync client
obsidian # Notes software
psysonic.packages.${pkgs.system}.default # Music player
inputs.psysonic.packages.${pkgs.system}.default # Music player
signal-desktop # Messaging
spotify # Music
super-productivity # Task app
sxiv # Minimal image viewer
tenacity # Audio software
thunderbird # Mail client
try-cli.packages.${pkgs.system}.default # Try CLI tool
inputs.try-cli.packages.${pkgs.system}.default # Try CLI tool
wally-cli # Keyboard flasher
wiremix # Audio mixer TUI
xournalpp # Handwriting note-taking software
@@ -65,7 +64,7 @@ in
force = true;
text = ''
{
"workspace.library": ["${pkgs-unstable.hyprland}/share/hypr/stubs"]
"workspace.library": ["${pkgs.hyprland}/share/hypr/stubs"]
}
'';
};
home/programs.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{ pkgs, lib, voxtype, walker, ... }:
{ pkgs, lib, inputs, ... }:
{
imports = [
walker.homeManagerModules.default
voxtype.homeManagerModules.default
inputs.walker.homeManagerModules.default
inputs.voxtype.homeManagerModules.default
];
programs = let
lock-false = {
@@ -33,7 +33,7 @@
};
voxtype = {
enable = true;
package = voxtype.packages.${pkgs.system}.vulkan;
package = inputs.voxtype.packages.${pkgs.system}.vulkan;
service.enable = true;
settings = {};
};
result
-1
View File
@@ -1 +0,0 @@
/nix/store/ldv0r3wrdz10h7q483hym4s5jajnmgs2-psysonic-1.50.0-dev
scratch/psysonic
-1
Submodule scratch/psysonic deleted from e66b674937
system/boot.nix
+3 -1
View File
@@ -56,7 +56,6 @@ in
"systemd.show_status=auto"
"splash"
];
bootspec.enable = true;
resumeDevice = "/dev/disk/by-partlabel/disk-${hostname}-root";
kernel.sysctl = {
"net.ipv4.ip_unprivileged_port_start" = 0;
@@ -69,6 +68,9 @@ in
DefaultTimeoutStopSec = "5s";
};
};
services.systemd-suspend.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
services.systemd-hibernate.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
services.systemd-suspend-then-hibernate.environment.SYSTEMD_SLEEP_FREEZE_USER_SESSIONS = "false";
};
}
system/hardware.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ pkgs-unstable, ... }:
{ pkgs, ... }:
{
hardware = {
@@ -11,7 +11,7 @@
opentabletdriver = {
enable = true;
package = pkgs-unstable.opentabletdriver;
package = pkgs.opentabletdriver;
};
uinput.enable = true;
};
system/packages.nix
+6 -5
View File
@@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, nix-gaming, ... }:
{ pkgs, nix-gaming, ... }:
{
nixpkgs.config.allowUnfree = true;
@@ -34,7 +34,7 @@
localsend # Local file sharing tool
makima # Key remapper for Linux TODO: Figure out and configure
mako # Notification daemon
pkgs-unstable.neovim # Editor
neovim # Editor
nix-gaming.mo2installer
pnpm # JavaScript package manager (used by Neovim plugins)
tree-sitter # Incremental parsing tool for editors
@@ -42,7 +42,7 @@
openssl # SSL/TLS toolkit
p7zip # 7-Zip archiver
pipewire
pkgs-unstable.yazi # Terminal file manager
yazi # Terminal file manager
pywal16 # Image colorscheme generator
qt6.qtwayland # qtwayland support
ripgrep # Better grep
@@ -62,8 +62,8 @@
v4l-utils # Video4Linux utilities TODO: Figure out why I need this
waybar # Status bar for Hyprland
wget # Download tool
pkgs-unstable.wineWow64Packages.stable # Wine packages for 64-bit and 32-bit support
pkgs-unstable.winetricks # Windows compatibility tool
wineWow64Packages.stable # Wine packages for 64-bit and 32-bit support
winetricks # Windows compatibility tool
wl-clipboard # Wayland clipboard manager
wlogout # Wayland logout menu
xdg-terminal-exec # XDG terminal execution utility
@@ -88,6 +88,7 @@
};
nix.settings = {
trusted-users = [ "root" "chris" ];
extra-substituters = [
"https://nix-gaming.cachix.org"
"https://walker.cachix.org"
system/programs.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, hostname, ... }:
{ pkgs, hostname, ... }:
{
programs = {
@@ -13,14 +13,14 @@
};
hyprland = {
enable = true;
package = pkgs-unstable.hyprland;
portalPackage = pkgs-unstable.xdg-desktop-portal-hyprland;
package = pkgs.hyprland;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
xwayland.enable = true;
withUWSM = true;
};
steam = {
enable = true;
package = pkgs-unstable.steam;
package = pkgs.steam;
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
system/services.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ pkgs-unstable, ... }:
{ pkgs, ... }:
{
services = {
@@ -10,7 +10,7 @@
fwupd.enable = true;
input-remapper = {
enable = true;
package = pkgs-unstable.input-remapper;
package = pkgs.input-remapper;
};
geoclue2 = {
enable = true;
@@ -32,7 +32,7 @@
enable = true;
wayland.enable = true;
theme = "maya";
package = pkgs-unstable.kdePackages.sddm;
package = pkgs.kdePackages.sddm;
};
autoLogin.enable = true;
autoLogin.user = "chris";
@@ -45,7 +45,7 @@
enable = true;
settings.Login = {
HandleLidSwitch = "suspend";
HandleLidSwitchDocked = "suspend";
HandleLidSwitchDocked = "ignore";
};
};
};
system/virtualisation.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ pkgs-unstable, ... }:
{ pkgs, ... }:
{
virtualisation = {
docker = {
enable = true;
autoPrune.enable = true;
package = pkgs-unstable.docker;
package = pkgs.docker;
};
};
}