jay/nixverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jay:main
Branches Tags
jay:main
..
compare: jay:fe1c77058328173d91051d609d1ba6320d64aeae
Branches Tags
jay:main

1 Commits
main ... fe1c770583

Author SHA1 Message Date
jay
fe1c770583 Add qutebrowser. 2025-07-16 10:47:11 -04:00
39 changed files with 75 additions and 562 deletions
Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -1,3 +1,3 @@
[submodule "private"] [submodule "private"]
path = private path = private
url = https://git.zerojay.com/jay/private.git url = https://git.zerojay.com/jay/private.git

18
README.md
View File

@@ -15,15 +15,15 @@ Machines
To-Do List To-Do List
[ ] Finish porting features from nixy's previous setup and get them working on lappy: impermanence. [ ] Finish porting features from nixy's previous setup and get them working on lappy: impermanence.
[ ] Set up declarative Discord setup with nixcord and plugins. [ ] Set up declarative Discord setup with nixcord and plugins.
[ ] Figure out how to set up sops-nix with user passwords properly. [ ] Figure out how to set up sops-nix with user passwords properly.
[X] Fully setup private git repository for secrets. [X] Fully setup private git repository for secrets.
[X] Integrate private git repository into nixverse setup. [X] Integrate private git repository into nixverse setup.
[X] Switch nixy over to this nixverse setup. [X] Switch nixy over to this nixverse setup.
[ ] Finish checking the apps I need on the arcade machine work under NixOS (attractmode, retroarch, teknoparrot, others). [ ] Finish checking the apps I need on the arcade machine work under NixOS (attractmode, retroarch, teknoparrot, others).
[ ] Setup arcade machine on NixOS. [ ] Setup arcade machine on NixOS.
[ ] Setup ally machine on NixOS. [ ] Setup ally machine on NixOS.
Installation Installation

128
flake.lock generated
View File

@@ -1,25 +1,5 @@
{ {
"nodes": { "nodes": {
"auto-cpufreq-stable-nixos": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1752998173,
"narHash": "sha256-ZlYpBp2WOe03UrpjJGz5KTOL/pp7A452hJO/Vc8C4/0=",
"owner": "AdnanHodzic",
"repo": "auto-cpufreq",
"rev": "562278377ffa96f3c1af49c7b499df028ce8d8bd",
"type": "github"
},
"original": {
"owner": "AdnanHodzic",
"repo": "auto-cpufreq",
"type": "github"
}
},
"base16": { "base16": {
"inputs": { "inputs": {
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
@@ -117,11 +97,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756733629, "lastModified": 1752541678,
"narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=", "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1", "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -151,11 +131,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1754487366, "lastModified": 1751413152,
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -286,11 +266,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756679287, "lastModified": 1752544374,
"narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -308,11 +288,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752603129, "lastModified": 1743604125,
"narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -328,11 +308,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1755569534, "lastModified": 1752292276,
"narHash": "sha256-ukXfV1cAsxoar0IVEO2/s3qnVEZpZf0wvqE3PIESobw=", "narHash": "sha256-cl1NEWTUsNxBmLjyvz+GDP4Hy7riaOszSGpfplHA7Y4=",
"owner": "Jas-SinghFSU", "owner": "Jas-SinghFSU",
"repo": "Hyprpanel", "repo": "Hyprpanel",
"rev": "6385f2e15df908e0c13bed800f4b091300e5b981", "rev": "59b57fca0634c98f23227ea948f87df7814e72f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -401,11 +381,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756950352, "lastModified": 1752631802,
"narHash": "sha256-CkNlcUeNlDmxF1GJwEQg3aIBSCihnFcAqCwBjUQGqNY=", "narHash": "sha256-t65TV28ZatEKVyFoTmExQgb8LECvrj/3Wuogn5PxfYI=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "64ac07fae89f297beab704dce70038cdbda55c25", "rev": "b8834a847dee8875e06e218830f33a3486f0185e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -463,22 +443,6 @@
"type": "github" "type": "github"
} }
}, },
"nixos-hardware-stable-nixos": {
"locked": {
"lastModified": 1756925795,
"narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "ba6fab29768007e9f2657014a6e134637100c57d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixos-images": { "nixos-images": {
"inputs": { "inputs": {
"nixos-stable": [ "nixos-stable": [
@@ -540,11 +504,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1753579242, "lastModified": 1751159883,
"narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -555,11 +519,11 @@
}, },
"nixpkgs-stable-nixos": { "nixpkgs-stable-nixos": {
"locked": { "locked": {
"lastModified": 1756886854, "lastModified": 1752436162,
"narHash": "sha256-6tooT142NLcFjt24Gi4B0G1pgWLvfw7y93sYEfSHlLI=", "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e6684e6c5755325f801bda1751a8a4038145d7d", "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -569,29 +533,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1756819007,
"narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1756819007, "lastModified": 1752596105,
"narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=", "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1", "rev": "dab3a6e781554f965bde3def0aa2fda4eb8f1708",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -617,7 +565,6 @@
}, },
"original": { "original": {
"owner": "hgl", "owner": "hgl",
"ref": "084a07f43829857fc760e70212c497d2f40eaa3c",
"repo": "nixverse", "repo": "nixverse",
"type": "github" "type": "github"
} }
@@ -650,17 +597,14 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"auto-cpufreq-stable-nixos": "auto-cpufreq-stable-nixos",
"disko-stable-nixos": "disko-stable-nixos", "disko-stable-nixos": "disko-stable-nixos",
"home-manager-stable-nixos": "home-manager-stable-nixos", "home-manager-stable-nixos": "home-manager-stable-nixos",
"hyprpanel-stable-nixos": "hyprpanel-stable-nixos", "hyprpanel-stable-nixos": "hyprpanel-stable-nixos",
"impermanence-stable-nixos": "impermanence-stable-nixos", "impermanence-stable-nixos": "impermanence-stable-nixos",
"nix-flatpak-stable-nixos": "nix-flatpak-stable-nixos", "nix-flatpak-stable-nixos": "nix-flatpak-stable-nixos",
"nix-gaming-stable-nixos": "nix-gaming-stable-nixos", "nix-gaming-stable-nixos": "nix-gaming-stable-nixos",
"nixos-hardware-stable-nixos": "nixos-hardware-stable-nixos",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable-nixos": "nixpkgs-stable-nixos", "nixpkgs-stable-nixos": "nixpkgs-stable-nixos",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixverse": "nixverse", "nixverse": "nixverse",
"sops-nix-stable-nixos": "sops-nix-stable-nixos", "sops-nix-stable-nixos": "sops-nix-stable-nixos",
"stylix-stable-nixos": "stylix-stable-nixos", "stylix-stable-nixos": "stylix-stable-nixos",
@@ -674,11 +618,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754988908, "lastModified": 1752544651,
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", "rev": "2c8def626f54708a9c38a5861866660395bb3461",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -708,11 +652,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1756812894, "lastModified": 1752672274,
"narHash": "sha256-wZfNe3ms+dS2cUEGe8ygqNxBHGQCRoJQuQM9xFgGad0=", "narHash": "sha256-UpUSLSoH31iV2QttW3/BO2i+QZqcPMVVPZ+gNm/66O8=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "a9553a7486c86259b7678235cc26cfd70296251d", "rev": "ab4ae25851db16a6abd4c8e08dd1afb49ec37944",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -885,11 +829,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756941389, "lastModified": 1752584655,
"narHash": "sha256-r7Km2PY1gxpNmq7dPbs89JiyHiJ5zRCF6cBPyb2WWGY=", "narHash": "sha256-nPHrsq0vSh0+BqV2xAAVsfoVqzP9KYG7Zicc6oA0nfk=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "d197dd7556567a7a4174dee543286e5e65198379", "rev": "759a7860416dfd8c86f383d4ea4009bb034d869c",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View File

@@ -2,19 +2,11 @@
inputs = { inputs = {
self.submodules = true; self.submodules = true;
nixpkgs-stable-nixos.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-stable-nixos.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixverse = { nixverse = {
url = "github:hgl/nixverse?ref=084a07f43829857fc760e70212c497d2f40eaa3c"; url = "github:hgl/nixverse";
inputs.nixpkgs.follows = "nixpkgs-stable-nixos"; inputs.nixpkgs.follows = "nixpkgs-stable-nixos";
}; };
auto-cpufreq-stable-nixos = {
url = "github:AdnanHodzic/auto-cpufreq";
inputs.nixpkgs.follows = "nixpkgs";
};
disko-stable-nixos = { disko-stable-nixos = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs-stable-nixos"; inputs.nixpkgs.follows = "nixpkgs-stable-nixos";
@@ -46,10 +38,6 @@
# url = "github:kaylorben/nixcord"; # url = "github:kaylorben/nixcord";
#}; #};
nixos-hardware-stable-nixos = {
url = "github:NixOS/nixos-hardware/master";
};
sops-nix-stable-nixos = { sops-nix-stable-nixos = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs-stable-nixos"; inputs.nixpkgs.follows = "nixpkgs-stable-nixos";

3
nodes/hosts/common/configuration.nix
View File

@@ -6,7 +6,6 @@
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.nix-gaming.nixosModules.pipewireLowLatency inputs.nix-gaming.nixosModules.pipewireLowLatency
./programs/appimage.nix
./programs/emulation.nix ./programs/emulation.nix
./programs/firefox.nix ./programs/firefox.nix
./programs/fonts.nix ./programs/fonts.nix
@@ -16,8 +15,8 @@
./programs/gstreamer.nix ./programs/gstreamer.nix
./programs/hyprland.nix ./programs/hyprland.nix
./programs/kde.nix ./programs/kde.nix
./programs/qutebrowser.nix
./programs/obs-studio.nix ./programs/obs-studio.nix
./programs/open-tv.nix
./programs/session-desktop.nix ./programs/session-desktop.nix
./programs/steam.nix ./programs/steam.nix
./programs/zen-browser.nix ./programs/zen-browser.nix

7
nodes/hosts/common/home/jay/home.nix
View File

@@ -12,16 +12,14 @@
./programs/alacritty.nix ./programs/alacritty.nix
./programs/bash.nix ./programs/bash.nix
./programs/btop.nix ./programs/btop.nix
./programs/emacs.nix
./programs/git.nix ./programs/git.nix
./programs/hyprland.nix ./programs/hyprland.nix
./programs/hyprlock.nix ./programs/hyprlock.nix
./programs/hyprpanel.nix ./programs/hyprpanel.nix
./programs/lazygit.nix ./programs/lazygit.nix
./programs/mangohud.nix ./programs/mangohud.nix
./programs/discord.nix #./programs/nixcord.nix
./programs/oh-my-posh.nix ./programs/oh-my-posh.nix
./programs/qutebrowser.nix
./programs/rbw.nix ./programs/rbw.nix
./programs/rofi.nix ./programs/rofi.nix
./programs/stylix.nix ./programs/stylix.nix
@@ -44,9 +42,8 @@
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.
home.packages = [ home.packages = [
pkgs.legcord
pkgs.libgtop pkgs.libgtop
pkgs.powertop
pkgs.upower
#pkgs.mpvpaper #pkgs.mpvpaper
# pkgs.hyprlandPlugins.hyprtrails # pkgs.hyprlandPlugins.hyprtrails
]; ];

9
nodes/hosts/common/home/jay/programs/discord.nix
View File

@@ -1,9 +0,0 @@
{ pkgs, ... }: {
home.packages = [
pkgs.betterdiscordctl
pkgs.discord
pkgs.legcord
pkgs.discover-overlay
];
}

5
nodes/hosts/common/home/jay/programs/emacs.nix
View File

@@ -1,5 +0,0 @@
{ ... }: {
programs.emacs = {
enable = true;
};
}

4
nodes/hosts/common/home/jay/programs/hyprland.nix
View File

@@ -207,7 +207,7 @@
# "systemctl --user start hyprpolkitagent" # "systemctl --user start hyprpolkitagent"
"steam --disable-gpu-compositing" # nvidia pls let me have nice things "steam --disable-gpu-compositing" # nvidia pls let me have nice things
#"vesktop" #"vesktop"
"goofcord" "legcord"
# "[workspace 9 silent] ELECTRON_OZONE_PLATFORM_HINT=x11 1password" # fix for promts not showing up anymore # "[workspace 9 silent] ELECTRON_OZONE_PLATFORM_HINT=x11 1password" # fix for promts not showing up anymore
"zen-twilight" "zen-twilight"
# "${pkgs.xorg.xhost}/bin/xhost +" # "${pkgs.xorg.xhost}/bin/xhost +"
@@ -225,7 +225,7 @@
windowrulev2 = [ windowrulev2 = [
"workspace 1 silent, class:^(zen-twilight)$" "workspace 1 silent, class:^(zen-twilight)$"
"workspace 2 silent, class:^(steam)$" "workspace 2 silent, class:^(steam)$"
"workspace 3 silent, class:^(goofcord)$" "workspace 3 silent, class:^(legcord)$"
"workspace 4 silent, class:^(com.core447.StreamController)$" "workspace 4 silent, class:^(com.core447.StreamController)$"
"float,class:(clipse)$" "float,class:(clipse)$"
"size 622 652,class:(clipse)$" "size 622 652,class:(clipse)$"

2
nodes/hosts/common/home/jay/programs/hyprpanel.nix
View File

@@ -6,7 +6,7 @@
"0" = { "0" = {
left = [ "dashboard" "separator" "microphone" "volume" "bluetooth" "hypridle" "separator" "network" "separator" "workspaces" "windowtitle" ]; left = [ "dashboard" "separator" "microphone" "volume" "bluetooth" "hypridle" "separator" "network" "separator" "workspaces" "windowtitle" ];
middle = [ "media" "cava" ]; middle = [ "media" "cava" ];
right = [ "cpu" "cputemp" "ram" "storage" "separator" "systray" "notifications" "battery" "separator" "weather" "clock" ]; right = [ "cpu" "cputemp" "ram" "storage" "separator" "systray" "notifications" "separator" "weather" "clock" ];
}; };
}; };

2
nodes/hosts/common/home/jay/services/arrpc.nix
View File

@@ -1,3 +1,3 @@
{ ... }: { { ... }: {
services.arrpc.enable = true; #services.arrpc.enable = true;
} }

5
nodes/hosts/common/programs/appimage.nix
View File

@@ -1,5 +0,0 @@
{ ... }: {
programs.appimage.enable = true;
programs.appimage.binfmt = true;
}

40
nodes/hosts/common/programs/appimages/drop.nix
View File

@@ -1,40 +0,0 @@
{ pkgs, ... }: let
pname = "Drop%20Desktop%20Client";
version = "0.3.0";
src = pkgs.fetchurl {
url = "https://github.com/Drop-OSS/drop-app/releases/download/v0.3.0/Drop.Desktop.Client_0.3.0_amd64.AppImage";
hash = "sha256-VVDzotrgu68CAGr4EqpWlW8ZOhf4cbt4a46WHJTnxjo=";
};
appimageContents = pkgs.appimageTools.extract {inherit pname version src;};
in
pkgs.appimageTools.wrapType2 {
inherit pname version src;
pkgs = pkgs;
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
# unless linked, the binary is placed in $out/bin/cursor-someVersion
# ln -s $out/bin/${pname}-${version} $out/bin/${pname}
'';
extraBwrapArgs = [
"--bind-try /etc/nixos/ /etc/nixos/"
];
# vscode likes to kill the parent so that the
# gui application isn't attached to the terminal session
dieWithParent = false;
extraPkgs = pkgs: with pkgs; [
unzip
autoPatchelfHook
asar
haskellPackages.gi-ayatana-appindicator3
# override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
(buildPackages.wrapGAppsHook.override {inherit (buildPackages) makeWrapper;})
];
}

11
nodes/hosts/common/programs/drop.nix
View File

@@ -1,11 +0,0 @@
{ pkgs, lib, inputs, ... }:
let
dropApp = import ./appimages/drop.nix { inherit pkgs; };
in
{
# ...
environment.systemPackages = with pkgs; [
dropApp
];
}

4
nodes/hosts/common/programs/emulation.nix
View File

@@ -13,9 +13,5 @@
services.flatpak.packages = [ services.flatpak.packages = [
"io.github.ryubing.Ryujinx" "io.github.ryubing.Ryujinx"
]; ];
environment.shellAliases = {
ryujinx = "flatpak run io.github.ryubing.Ryujinx";
};
} }

4
nodes/hosts/common/programs/gaming.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, ... }: { { pkgs, ... }: {
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = [ environment.systemPackages = [
@@ -11,8 +11,6 @@
pkgs.protonup-qt pkgs.protonup-qt
pkgs.wineWowPackages.stable pkgs.wineWowPackages.stable
pkgs.winetricks pkgs.winetricks
pkgs-unstable.nero-umu
pkgs-unstable.protonplus
]; ];
} }

4
nodes/hosts/common/programs/general.nix
View File

@@ -17,12 +17,10 @@
pkgs.btop pkgs.btop
pkgs.chatterino2 pkgs.chatterino2
pkgs.clipse pkgs.clipse
#(pkgs.discord.override { withMoonlight = true; })
pkgs.dmidecode pkgs.dmidecode
pkgs.dysk pkgs.dysk
pkgs.elinks pkgs.elinks
pkgs.fastfetch pkgs.fastfetch
pkgs.gearlever
pkgs.git pkgs.git
pkgs.gnumake pkgs.gnumake
#pkgs.gpustat #pkgs.gpustat
@@ -40,7 +38,6 @@
pkgs.nix-search-tv pkgs.nix-search-tv
pkgs.nvd pkgs.nvd
pkgs.nyxt pkgs.nyxt
pkgs.overlayed
pkgs.p7zip-rar pkgs.p7zip-rar
pkgs.pciutils pkgs.pciutils
pkgs.pinentry-curses pkgs.pinentry-curses
@@ -57,7 +54,6 @@
pkgs.usbutils pkgs.usbutils
pkgs.vlc pkgs.vlc
pkgs.wf-recorder pkgs.wf-recorder
pkgs.zip
pkgs'.nixverse pkgs'.nixverse
]; ];
} }

10
nodes/hosts/common/programs/open-tv.nix
View File

@@ -1,10 +0,0 @@
{ ... }: {
services.flatpak.packages = [
"dev.fredol.open-tv"
];
environment.shellAliases = {
open-tv = "flatpak run dev.fredol.open-tv";
};
}

0
nodes/hosts/common/home/jay/programs/qutebrowser.nix → nodes/hosts/common/programs/qutebrowser.nix
View File

4
nodes/hosts/common/programs/steam.nix
View File

@@ -28,9 +28,5 @@
}; };
}; };
}; };
environment.systemPackages = [
pkgs.samrewritten
];
} }

4
nodes/hosts/common/services/sound.nix
View File

@@ -11,11 +11,11 @@
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
#wireplumber.enable = true; wireplumber.enable = true;
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
jack.enable = true; jack.enable = true;
lowLatency.enable = false; lowLatency.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default, # use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now) # no need to redefine it in your config for now)

32
nodes/hosts/common/system/bootloader.nix
View File

@@ -4,33 +4,33 @@
]; ];
boot = { boot = {
#initrd.verbose = false; initrd.verbose = false;
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
kernelPackages = pkgs.linuxPackages_xanmod_stable; kernelPackages = pkgs.linuxPackages_xanmod_stable;
#kernelParams = [ kernelParams = [
#"quiet" "quiet"
#"splash" "splash"
#"boot.shell_on_fail" "boot.shell_on_fail"
#"udev.log_priority=3" "udev.log_priority=3"
#"rc.systemd.show_status=auto" "rc.systemd.show_status=auto"
#]; ];
extraModprobeConfig = '' extraModprobeConfig = ''
options bluetooth enable_ecred=1 options bluetooth enable_ecred=1
''; '';
#plymouth = { plymouth = {
# enable = true; enable = true;
# theme = lib.mkForce "glitch"; theme = lib.mkForce "glitch";
# themePackages = [ themePackages = [
# (pkgs.adi1090x-plymouth-themes.override { selected_themes = [ "glitch" ]; }) (pkgs.adi1090x-plymouth-themes.override { selected_themes = [ "glitch" ]; })
# ]; ];
#}; };
#consoleLogLevel = 3; consoleLogLevel = 3;
loader.timeout = 3; loader.timeout = 3;
}; };
} }

1
nodes/hosts/common/system/environment.nix
View File

@@ -9,6 +9,7 @@
shellAliases = { shellAliases = {
ls = "lsd -la"; ls = "lsd -la";
ryujinx = "flatpak run io.github.ryubing.Ryujinx";
}; };
# Get plasma integration with browsers to work better. # Get plasma integration with browsers to work better.

1
nodes/hosts/group.nix
View File

@@ -7,5 +7,4 @@
nixy = { nixy = {
deploy.local = true; deploy.local = true;
}; };
nixwork = {};
} }

24
nodes/hosts/nixwork/configuration.nix
View File

@@ -1,24 +0,0 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ inputs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
inputs.nixos-hardware.nixosModules.framework-16-7040-amd
./programs/sof-firmware.nix
# Not working yet.
./services/fprintd.nix
./services/lidswitch.nix
./services/touchpad.nix
./system/bootloader.nix
./system/filesystems.nix
./system/networking.nix
];
system.stateVersion = "25.05"; # Did you read the comment?
}

110
nodes/hosts/nixwork/disk-config.nix
View File

@@ -1,110 +0,0 @@
{
disko.devices = {
disk = {
nvme1n1 = {
type = "disk";
device = "/dev/nvme0n1";
content = {
type = "gpt";
partitions = {
ESP = {
label = "boot";
name = "ESP";
size = "4500M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [
"umask=0077"
"defaults"
];
};
};
luks = {
size = "100%";
label = "luks";
content = {
type = "luks";
name = "cryptroot";
# disable settings.keyFile if you want to use interactive password entry
#passwordFile = "/tmp/secret.key"; # Interactive
settings = {
allowDiscards = true;
#keyFile = "/tmp/secret.key";
};
#additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
content = {
type = "btrfs";
extraArgs = [ "-L" "nixos" "-f" ];
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = [
"subvol=root"
"compress=zstd"
"noatime"
];
};
"/root-blank" = {
mountOptions = [
"subvol=root-blank"
"nodatacow"
"noatime"
];
};
"/home" = {
mountpoint = "/home";
mountOptions = [
"subvol=home"
"compress=zstd"
"noatime"
];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = [
"subvol=nix"
"compress=zstd"
"noatime"
];
};
"/persist" = {
mountpoint = "/persist";
mountOptions = [
"subvol=persist"
"compress=zstd"
"noatime"
];
};
"/log" = {
mountpoint = "/var/log";
mountOptions = [
"subvol=log"
"compress=zstd"
"noatime"
];
};
"/lib" = {
mountpoint = "/var/lib";
mountOptions = [
"subvol=lib"
"compress=zstd"
"noatime"
];
};
};
};
};
};
};
};
};
};
};
fileSystems."/persist".neededForBoot = true;
fileSystems."/var/log".neededForBoot = true;
fileSystems."/var/lib".neededForBoot = true;
}

26
nodes/hosts/nixwork/hardware-configuration.nix
View File

@@ -1,26 +0,0 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp193s0f3u1.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

8
nodes/hosts/nixwork/home/jay/home.nix
View File

@@ -1,8 +0,0 @@
{ ... }:
{
imports = [
./programs/hyprland.nix
./programs/hyprpanel.nix
];
}

7
nodes/hosts/nixwork/home/jay/programs/hyprland.nix
View File

@@ -1,7 +0,0 @@
{ ... }: {
wayland.windowManager.hyprland = {
settings = {
"monitor" = "eDP-1, 2560x1600@60, 0x0, 1";
};
};
}

13
nodes/hosts/nixwork/home/jay/programs/hyprpanel.nix
View File

@@ -1,13 +0,0 @@
{ lib, ... }: {
programs.hyprpanel = {
settings = {
bar = {
customModules = {
cava = {
framerate = lib.mkForce 120;
};
};
};
};
};
}

4
nodes/hosts/nixwork/node.nix
View File

@@ -1,4 +0,0 @@
{
os = "nixos";
channel = "stable";
}

8
nodes/hosts/nixwork/programs/sof-firmware.nix
View File

@@ -1,8 +0,0 @@
{ pkgs, ... }: {
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = [
pkgs.sof-firmware
];
}

3
nodes/hosts/nixwork/services/fprintd.nix
View File

@@ -1,3 +0,0 @@
{ pkgs, ...}: {
services.fprintd.enable = true;
}

4
nodes/hosts/nixwork/services/lidswitch.nix
View File

@@ -1,4 +0,0 @@
{ pkgs, ...}: {
services.logind.lidSwitch = "poweroff";
services.logind.lidSwitchExternalPower = "lock";
}

4
nodes/hosts/nixwork/services/touchpad.nix
View File

@@ -1,4 +0,0 @@
{ ... }: {
# Enable touchpad support (enabled default in most desktopManager).
services.libinput.enable = true;
}

52
nodes/hosts/nixwork/system/bootloader.nix
View File

@@ -1,52 +0,0 @@
{ config, ... }: {
boot = {
tmp = {
useTmpfs = true;
tmpfsSize = "50%";
};
kernelModules = [ "kvm-intel" ];
extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
extraModprobeConfig = '' options bluetooth disable_ertm=1 '';
initrd = {
# OLD CONFIG
# NAME FSTYPE FSVER LABEL UUID FSAVAIL FSUSE% MOUNTPOINTS
# nvme0n1
# └─nvme0n1p1 crypto_LUKS 2 e174181f-828c-44fd-97c1-0e2fdc2322e5
# └─luks-e174181f-828c-44fd-97c1-0e2fdc2322e5 btrfs home f8ed950a-5cc9-4b87-901c-4cfece6daf6c 3.3T 9% /home
# luks.devices."luks-e174181f-828c-44fd-97c1-0e2fdc2322e5".device = "/dev/disk/by-uuid/e174181f-828c-44fd-97c1-0e2fdc2322e5";
# nvme1n1
# ├─nvme1n1p1 vfat FAT32 D19B-1967 4.3G 3% /boot
# ├─nvme1n1p2 crypto_LUKS 2 300fdb2a-d887-4e53-bc97-9fdc123856ce
# │ └─luks-300fdb2a-d887-4e53-bc97-9fdc123856ce swap 1 swap 66b9e1f6-1fc5-4c32-afc7-724880504495 [SWAP]
# luks.devices."luks-300fdb2a-d887-4e53-bc97-9fdc123856ce".device = "/dev/disk/by-uuid/300fdb2a-d887-4e53-bc97-9fdc123856ce";
# └─nvme1n1p3 crypto_LUKS 2 e69c5d63-f5a7-4cb1-a858-4e6396d8def7
# └─luks-e69c5d63-f5a7-4cb1-a858-4e6396d8def7 btrfs root f53b22d4-df74-4ee0-9f85-3fb0eb087150 /nix/store
# luks.devices."luks-e69c5d63-f5a7-4cb1-a858-4e6396d8def7".device = "/dev/disk/by-uuid/e69c5d63-f5a7-4cb1-a858-4e6396d8def7";
# NEW CONFIG
# nvme0n1
# └─nvme0n1p1 crypto_LUKS 2 1976c849-c317-46c0-af98-d2dfc455c489
# └─crypthome btrfs home c63ca365-e963-4ea4-bb71-ed1c7e1b6bc8 /mnt/home
# luks.devices."crypthome".device = "/dev/disk/by-uuid/1976c849-c317-46c0-af98-d2dfc455c489";
# nvme1n1
# ├─nvme1n1p1 vfat FAT32 CDA0-8838 4.4G 0% /mnt/boot
# └─nvme1n1p2 crypto_LUKS 2 e948662c-ae57-46aa-b7bf-cc09dbaa8cdb
# └─cryptroot btrfs nixos 77021dd1-9fa5-4e9f-9be2-ba943e6de77c 925.1G 0% /mnt/var/log
# /mnt/persist
# /mnt/nix
# /mnt
luks.devices."cryptroot" = {
device = "/dev/disk/by-partlabel/luks";
allowDiscards = true;
};
kernelModules = [ ];
availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
};
};
}

54
nodes/hosts/nixwork/system/filesystems.nix
View File

@@ -1,54 +0,0 @@
{ ... }: {
fileSystems."/" =
{ device = "/dev/mapper/cryptroot";
fsType = "btrfs";
options = [ "subvol=root" "compress=zstd" "noatime" ];
};
fileSystems."/home" =
{ device = "/dev/mapper/cryptroot";
fsType = "btrfs";
options = [ "subvol=home" "compress=zstd" "noatime" ];
};
fileSystems."/nix" =
{ device = "/dev/mapper/cryptroot";
fsType = "btrfs";
options = [ "subvol=nix" "compress=zstd" "noatime" ];
};
fileSystems."/var/log" =
{ device = "/dev/mapper/cryptroot";
fsType = "btrfs";
options = [ "subvol=log" "compress=zstd" "noatime" ];
neededForBoot = true;
};
fileSystems."/var/lib" =
{ device = "/dev/mapper/cryptroot";
fsType = "btrfs";
options = [ "subvol=lib" "compress=zstd" "noatime" ];
neededForBoot = true;
};
fileSystems."/persist" =
{ device = "/dev/mapper/cryptroot";
fsType = "btrfs";
options = [ "subvol=persist" "compress=zstd" "noatime" ];
neededForBoot = true;
};
fileSystems."/boot" =
{ device = "/dev/disk/by-partlabel/boot";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [{
device = "/swapfile";
size = 18 * 1024;
}];
}

4
nodes/hosts/nixwork/system/networking.nix
View File

@@ -1,4 +0,0 @@
{ ... }: {
networking.hostName = "nixwork"; # Define your hostname.
}

2
private

Submodule private updated: 7d635d0d2f...c91ae3eb5c