emmet/nixos-config
0
1
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Updated systems

Browse Source
This commit is contained in:
Emmet
2025-04-05 10:40:25 -05:00
parent 145505bd25
commit 13d7a83981
7 changed files with 154 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
flake.lock generated
View File

@@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1742213273,
"narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=",
"lastModified": 1743265529,
"narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf",
"rev": "1d2dbd72c2bbaceab031c592d4810f744741d203",
"type": "github"
},
"original": {
@@ -126,11 +126,11 @@
"blocklist-hosts": {
"flake": false,
"locked": {
"lastModified": 1742998852,
"narHash": "sha256-8mP510jw0gDsr/TtPiSdjK3fLAA1mFgwcYJerLZ+QBM=",
"lastModified": 1743627497,
"narHash": "sha256-TT5aJA/O9SHAjSDcHpQ6MeB8ot1k2f8J7yuz04ssI9g=",
"owner": "StevenBlack",
"repo": "hosts",
"rev": "60f983269a1d157f7ccdc13c81717a25a55bf15c",
"rev": "815487ebb90b4698aa0800ec4ba5302368bdf585",
"type": "github"
},
"original": {
@@ -185,11 +185,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1743153396,
"narHash": "sha256-Wtgr/u0kYqMHvKjXRu9b7mPo32YDw/7IOIJ2eV8KFuQ=",
"lastModified": 1743846340,
"narHash": "sha256-ZX+SirCnujuBuTftDXpL2IxzIO4UXGZdFiMy3pbHtRQ=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "40a9308b06ee2061c5871038024ffcfd992a9ce8",
"rev": "f529d87520a4ca4083b94c28a47b33b3d9593669",
"type": "github"
},
"original": {
@@ -473,11 +473,11 @@
]
},
"locked": {
"lastModified": 1743136572,
"narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=",
"lastModified": 1743788974,
"narHash": "sha256-2LeVyQZI2wTkSzMLvnN/kJjXVWp4HCVUoq17Bv8TNTk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1efd2503172016a6742c87b47b43ca2c8145607d",
"rev": "0f5908daf890c3d7e7052bef1d6deb0f2710aaa1",
"type": "github"
},
"original": {
@@ -615,11 +615,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1743165127,
"narHash": "sha256-3tqo7xha/WDZN/WhjCM/hVRp9V8ROH3EvUYJhib4uc4=",
"lastModified": 1743809433,
"narHash": "sha256-tCOlE2zMXfd+KNG5ETr2VxhbniDMD7jBbD0JQhYBrlc=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "c93140a5f12a25f0a08b162caf31fe68fec62290",
"rev": "8ba20fcae124591718bddadd94c5e8c381d02097",
"type": "github"
},
"original": {
@@ -641,11 +641,11 @@
]
},
"locked": {
"lastModified": 1738422629,
"narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
"lastModified": 1743549251,
"narHash": "sha256-yf+AXt0RkAkCyF6iSnJt6EJAnNG/l6qv70CVzhRP6Bg=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
"rev": "4ab17ccac08456cb5e00e8bd323de2efd30612be",
"type": "github"
},
"original": {
@@ -794,11 +794,11 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1743062552,
"narHash": "sha256-JBb5cdHYMsb8+RBsOGwImFRAjmbxWeehRHg6MFEkquo=",
"lastModified": 1743624959,
"narHash": "sha256-xsSVHatubv6MFexuqZsYQJgjjQ1Mlwn+L8FtGGBhVDs=",
"ref": "refs/heads/main",
"rev": "d9a162531542d8f7ad431fe9d6162871e5cffb9b",
"revCount": 344,
"rev": "0b1f2a97ef10cfd10669cbfbb3e45d1cab1073a0",
"revCount": 347,
"type": "git",
"url": "https://code.hyprland.org/hyprwm/hyprlock.git"
},
@@ -900,6 +900,25 @@
"type": "github"
}
},
"jovian_2": {
"inputs": {
"nix-github-actions": "nix-github-actions_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1743660830,
"narHash": "sha256-ezJqPIuB25iMJeugwHKWnB1DjMvrdpkrPxE3TCULjGk=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "c7ade1c8fe2bdb70d38b3b9a97b874dcaf33b755",
"type": "github"
},
"original": {
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
@@ -923,6 +942,28 @@
"type": "github"
}
},
"nix-github-actions_2": {
"inputs": {
"nixpkgs": [
"jovian",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729697500,
"narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
"owner": "zhaofengli",
"repo": "nix-github-actions",
"rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"ref": "matrix-name",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1737929020,
@@ -941,11 +982,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1742937945,
"narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
"lastModified": 1743703532,
"narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
"rev": "bdb91860de2f719b57eef819b5617762f7120c70",
"type": "github"
},
"original": {
@@ -957,11 +998,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1742937945,
"narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
"lastModified": 1743703532,
"narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
"rev": "bdb91860de2f719b57eef819b5617762f7120c70",
"type": "github"
},
"original": {
@@ -972,11 +1013,27 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1742889210,
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
"lastModified": 1743583204,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1743583204,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
"type": "github"
},
"original": {
@@ -985,7 +1042,7 @@
"type": "indirect"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1736320768,
"narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
@@ -1001,7 +1058,7 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1741513245,
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
@@ -1096,7 +1153,8 @@
"hyprland": "hyprland",
"hyprlock": "hyprlock",
"hyprutils": "hyprutils",
"nixpkgs": "nixpkgs_2",
"jovian": "jovian_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable_2",
"plasma-manager": "plasma-manager",
"rust-overlay": "rust-overlay_2",
@@ -1144,14 +1202,14 @@
},
"rust-overlay_2": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1743129211,
"narHash": "sha256-gE8t+U9miTwm2NYWS9dFY8H1/QB4ifaFDq1KdV9KEqo=",
"lastModified": 1743820323,
"narHash": "sha256-UXxJogXhPhBFaX4uxmMudcD/x3sEGFtoSc4busTcftY=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "f93da1d26ba9963f34f94a6872b67a7939699543",
"rev": "b4734ce867252f92cdc7d25f8cc3b7cef153e703",
"type": "github"
},
"original": {
@@ -1167,11 +1225,11 @@
]
},
"locked": {
"lastModified": 1741460499,
"narHash": "sha256-+162iWgwCKkkvrse9CBatsj4O0IyHj2SquBldXB3qsk=",
"lastModified": 1743867028,
"narHash": "sha256-a+Ehhui2yGJtldBbtR+3tePBbzV2tlMC2aaOEcKR9jg=",
"ref": "refs/heads/main",
"rev": "a3a90b3f485e677a096199c04c6e1cf48fdc8464",
"revCount": 24,
"rev": "e31fbee6bc46eabaeebe418175995abaa62bc6eb",
"revCount": 25,
"type": "git",
"url": "file://path:/etc/nixos.secrets"
},
@@ -1192,7 +1250,7 @@
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"nur": "nur",
"systems": "systems_5",
"tinted-foot": "tinted-foot",
@@ -1202,11 +1260,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1743075971,
"narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=",
"lastModified": 1743775855,
"narHash": "sha256-ZhhiYvHlA9f/Ck1i76ilfapLS7abLPRlWJQRxJEDTnQ=",
"owner": "danth",
"repo": "stylix",
"rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a",
"rev": "581fa67c818aaf91a1533149fb737d3e8c0949b8",
"type": "github"
},
"original": {

4
flake.nix
View File

@@ -22,7 +22,7 @@
allowUnfree = true;
allowUnfreePredicate = (_: true);
};
overlays = [ inputs.rust-overlay.overlays.default inputs.emacs-overlay.overlays.default inputs.chaotic.overlays.default ];
overlays = [ inputs.rust-overlay.overlays.default inputs.emacs-overlay.overlays.default inputs.chaotic.overlays.default inputs.jovian.overlays.default ];
};
pkgs-stable = import inputs.nixpkgs-stable {
@@ -82,6 +82,8 @@
nixpkgs-stable.url = "nixpkgs/nixos-24.11";
chaotic.url = "github:chaotic-cx/nyx/5071a4037c634d41a57926521fef2e179abe3bd9";
jovian.url = "github:Jovian-Experiments/Jovian-NixOS";
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";

24
hosts/snowfire/configuration.nix
View File

@@ -4,8 +4,8 @@
config = {
systemSettings = {
# users
users = [ "emmet" "corrina" ];
adminUsers = [ "emmet" "corrina" ];
users = [ "emmet" ];
adminUsers = [ "emmet" ];
# hardware
cachy.enable = true;
@@ -53,16 +53,16 @@
name = "Emmet";
email = "emmet@librephoenix.com";
};
users.users.corrina.description = "Corrina";
home-manager.users.corrina.userSettings = {
name = "Corrina";
email = "";
stylix.theme = "spaceduck";
};
home-manager.users.corrina.services.nextcloud-client = {
enable = lib.mkForce false;
startInBackground = lib.mkForce false;
};
#users.users.corrina.description = "Corrina";
#home-manager.users.corrina.userSettings = {
# name = "Corrina";
# email = "";
# stylix.theme = "spaceduck";
#};
#home-manager.users.corrina.services.nextcloud-client = {
# enable = lib.mkForce false;
# startInBackground = lib.mkForce false;
#};
};

10
modules/system/gaming/default.nix
View File

@@ -1,9 +1,13 @@
{ lib, config, pkgs, ... }:
{ lib, config, pkgs, inputs, ... }:
let
cfg = config.systemSettings.gaming;
in {
imports = [
inputs.jovian.nixosModules.default
];
options = {
systemSettings.gaming = {
enable = lib.mkEnableOption "Enable Steam and games";
@@ -11,7 +15,7 @@ in {
};
config = lib.mkIf cfg.enable {
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam" "steam-unwrapped" ];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam" "steam-unwrapped" "steam-jupiter-unwrapped" ];
nixpkgs.config.packageOverrides = pkgs: {
steam = pkgs.steam.override {
extraPkgs = pkgs: with pkgs; [
@@ -63,6 +67,8 @@ in {
programs.gamemode.enable = true;
programs.gamescope.enable = true;
programs.gamescope.capSysNice = false;
jovian.decky-loader.enable = true;
jovian.hardware.has.amd.gpu = true;
programs.steam.gamescopeSession = {
enable = true;
env = {

34
modules/system/hyprland/default.nix
View File

@@ -25,17 +25,17 @@ in
# Necessary packages
environment.systemPackages = with pkgs; [
jq
(sddm-chili-theme.override {
themeConfig = {
background = config.stylix.image;
ScreenWidth = 1920;
ScreenHeight = 1080;
blur = true;
recursiveBlurLoops = 3;
recursiveBlurRadius = 5;
# TODO fix icons with svgs patched from stylix colors
};})
jq
(sddm-astronaut.override {
themeConfig = {
# TODO Update Theme Config
# https://github.com/Keyitdev/sddm-astronaut-theme/blob/master/Themes/astronaut.conf
background = config.stylix.image;
ScreenWidth = 1920;
ScreenHeight = 1080;
blur = false;
};
})
];
# Display manager
@@ -43,8 +43,16 @@ in
enable = true;
wayland.enable = true;
enableHidpi = true;
theme = "chili";
package = pkgs.libsForQt5.sddm;
theme = "sddm-astronaut-theme";
package = pkgs.kdePackages.sddm;
extraPackages = with pkgs; [
(sddm-astronaut.override {
themeConfig = {
background = config.stylix.image;
ScreenWidth = 1920;
ScreenHeight = 1080;
blur = false;
};})];
};
services.upower.enable = true;

10
modules/system/phoenix/default.nix
View File

@@ -37,11 +37,11 @@
pushd ${config.systemSettings.dotfilesDir} &> /dev/null;
nix flake update "''${@:2}";
popd &> /dev/null;
if [ "$#" -eq 1 ]; then
pushd ${config.systemSettings.secretsFlakeDir} &> /dev/null;
nix flake update;
popd &> /dev/null;
fi
#if [ "$#" -eq 1 ]; then
# pushd ${config.systemSettings.secretsFlakeDir} &> /dev/null;
# nix flake update;
# popd &> /dev/null;
#fi
exit 0;
elif [ "$1" = "pull" ]; then
if [ "$#" -gt 1 ]; then

2
modules/user/emacs/default.nix
View File

@@ -33,7 +33,7 @@ in {
org-roam org-node org-node-fakeroam
vterm vterm-toggle sudo-edit
direnv
gdscript-mode
#gdscript-mode
nix-mode
python python-mode
lsp-mode flycheck lsp-ui lsp-treemacs