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

Minor updates and got all systems to build!

Browse Source
This commit is contained in:
Emmet
2025-02-12 15:57:42 -06:00
parent 52ce2d1cb1
commit 25b7cbb919
13 changed files with 336 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

278
flake.lock generated
View File

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731496216, "lastModified": 1737636397,
"narHash": "sha256-nlQrNN+tmJ+iP6Ck/czwZI0Hxz3oNvUyGkVruxJwgwA=", "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "3b00e96f90cb0040de6d88ad99bf5f4d443f0c59", "rev": "7fe006981fae53e931f513026fc754e322f13145",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -447,11 +447,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738178255, "lastModified": 1737634937,
"narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=", "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82", "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -461,6 +461,35 @@
} }
}, },
"hyprgraphics": { "hyprgraphics": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1737634889,
"narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprgraphics",
"type": "github"
}
},
"hyprgraphics_2": {
"inputs": { "inputs": {
"hyprutils": [ "hyprutils": [
"hyprlock", "hyprlock",
@ -493,8 +522,10 @@
"inputs": { "inputs": {
"aquamarine": "aquamarine", "aquamarine": "aquamarine",
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprgraphics": "hyprgraphics",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprland-qtutils": "hyprland-qtutils",
"hyprlang": "hyprlang_2",
"hyprutils": [ "hyprutils": [
"hyprutils" "hyprutils"
], ],
@ -507,20 +538,18 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1731526492, "lastModified": 1738457237,
"narHash": "sha256-2Gob+eZEPpF225QrRLXyfeQ9L63YHFa/tNh15FW/Rzo=", "narHash": "sha256-9mtM+lwnmXnv5TPmdij1rR5fLzzqSjkltcyEuRf8uIk=",
"ref": "refs/heads/main", "owner": "hyprwm",
"rev": "3fb47372b79265ebdabeeefdad10359d5b18377a", "repo": "Hyprland",
"revCount": 5451, "rev": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff",
"submodules": true, "type": "github"
"type": "git",
"url": "https://code.hyprland.org/hyprwm/Hyprland.git"
}, },
"original": { "original": {
"rev": "3fb47372b79265ebdabeeefdad10359d5b18377a", "owner": "hyprwm",
"submodules": true, "ref": "v0.47.2",
"type": "git", "repo": "Hyprland",
"url": "https://code.hyprland.org/hyprwm/Hyprland.git" "type": "github"
} }
}, },
"hyprland-protocols": { "hyprland-protocols": {
@ -535,11 +564,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728345020, "lastModified": 1737556638,
"narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "a7c183800e74f337753de186522b9017a07a8cee", "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -548,7 +577,95 @@
"type": "github" "type": "github"
} }
}, },
"hyprland-qt-support": {
"inputs": {
"hyprlang": "hyprlang",
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"systems"
]
},
"locked": {
"lastModified": 1737634706,
"narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"rev": "8810df502cdee755993cb803eba7b23f189db795",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"type": "github"
}
},
"hyprland-qtutils": {
"inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1737811848,
"narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"type": "github"
}
},
"hyprlang": { "hyprlang": {
"inputs": {
"hyprutils": "hyprutils",
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"systems"
]
},
"locked": {
"lastModified": 1737634606,
"narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "f41271d35cc0f370d300413d756c2677f386af9d",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_2": {
"inputs": { "inputs": {
"hyprutils": [ "hyprutils": [
"hyprland", "hyprland",
@ -564,11 +681,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728168612, "lastModified": 1737634606,
"narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "rev": "f41271d35cc0f370d300413d756c2677f386af9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -577,7 +694,7 @@
"type": "github" "type": "github"
} }
}, },
"hyprlang_2": { "hyprlang_3": {
"inputs": { "inputs": {
"hyprutils": [ "hyprutils": [
"hyprlock", "hyprlock",
@ -608,8 +725,8 @@
}, },
"hyprlock": { "hyprlock": {
"inputs": { "inputs": {
"hyprgraphics": "hyprgraphics", "hyprgraphics": "hyprgraphics_2",
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang_3",
"hyprutils": [ "hyprutils": [
"hyprutils" "hyprutils"
], ],
@ -635,6 +752,37 @@
} }
}, },
"hyprutils": { "hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"hyprlang",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"hyprlang",
"systems"
]
},
"locked": {
"lastModified": 1737632363,
"narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "006620eb29d54ea9086538891404c78563d1bae1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprutils_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -642,16 +790,15 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1736164519, "lastModified": 1739048933,
"narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3c895da64b0eb19870142196fa48c07090b441c4", "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499",
"revCount": 70, "revCount": 84,
"type": "git", "type": "git",
"url": "https://code.hyprland.org/hyprwm/hyprutils.git" "url": "https://code.hyprland.org/hyprwm/hyprutils.git"
}, },
"original": { "original": {
"rev": "3c895da64b0eb19870142196fa48c07090b441c4",
"type": "git", "type": "git",
"url": "https://code.hyprland.org/hyprwm/hyprutils.git" "url": "https://code.hyprland.org/hyprwm/hyprutils.git"
} }
@ -668,11 +815,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726874836, "lastModified": 1735493474,
"narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -784,22 +931,6 @@
} }
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": {
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1738163270, "lastModified": 1738163270,
"narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", "narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=",
@ -861,6 +992,29 @@
"type": "github" "type": "github"
} }
}, },
"plasma-manager": {
"inputs": {
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1736549395,
"narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
"owner": "nix-community",
"repo": "plasma-manager",
"rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "plasma-manager",
"type": "github"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -868,15 +1022,14 @@
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
], ]
"nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1731363552, "lastModified": 1737465171,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -893,9 +1046,10 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprlock": "hyprlock", "hyprlock": "hyprlock",
"hyprutils": "hyprutils", "hyprutils": "hyprutils_2",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-stable": "nixpkgs-stable_2",
"plasma-manager": "plasma-manager",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"secrets": "secrets", "secrets": "secrets",
"stylix": "stylix" "stylix": "stylix"
@ -1140,11 +1294,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730743262, "lastModified": 1737634991,
"narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
flake.nix
View File

@ -85,10 +85,7 @@
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland = { hyprland = {
type = "git"; url = "github:hyprwm/Hyprland/v0.47.2?submodules=true";
url = "https://code.hyprland.org/hyprwm/Hyprland.git";
submodules = true;
rev = "3fb47372b79265ebdabeeefdad10359d5b18377a"; #v0.45.0
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.hyprutils.follows = "hyprutils"; inputs.hyprutils.follows = "hyprutils";
}; };
@ -96,7 +93,6 @@
hyprutils = { hyprutils = {
type = "git"; type = "git";
url = "https://code.hyprland.org/hyprwm/hyprutils.git"; url = "https://code.hyprland.org/hyprwm/hyprutils.git";
rev = "3c895da64b0eb19870142196fa48c07090b441c4";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -108,6 +104,12 @@
inputs.hyprutils.follows = "hyprutils"; inputs.hyprutils.follows = "hyprutils";
}; };
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
emacs-overlay = { emacs-overlay = {

7
hosts/ori/configuration.nix
View File

@ -29,9 +29,14 @@
sshd.enable = true; sshd.enable = true;
}; };
stylix = {
enable = true;
theme = "tomorrow-night";
}; };
user.users.emmet.openssh.authorizedKeys.keys = [ };
users.users.emmet.openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDaeejVJwUVrIZSo1isbu+gkQ7+8ftCgCsczy3OclkEVWHyRTqlG6yp74hr3j8ZNsOhov7c2Q6RqC8oy669hlxi/y9BsvtlI7sBr94oAKFOmkCS4RiK72ngJjBvI0vbk89wQQjmAd3r8B7ZcedpNOC8CkHu8SebKdYPRIUvAbPc3fTEt7DsJkazAepZCB8LEhUp57FAqQ/Ezlt3X/1uwNq5S0EbE9Zm+nUpEfSqR9apY2neKWLyGiCxpK3dzyNOuulCxvtVz+ie2sTk/6SxM+qWEoVVxhdwyxPihEjgC0EvtG0S5mVh5JmcjRkJOzzBHJuw+6r8yWn/AxGdIsoJ4rKNxH1XH1iLHgCraOLOUjUNlmejTcQPu6o92a79fdz2gCHT/BuIjfCW7MErAC3YSmF45TSur/kiWCBaTqYo06pgbQ3w1vKg7fievQlQzsutmg47RvJp6fb74yxuOdVg39cShQu/l8r6zqm21JAeUaaIp4P/0MrAIMOOVUhbK0QgsNElO4yn0ZKH8wGIF8xORh7ikxUIAyq8C41gjJiO2sAFJc3M8DhduQU3X0lHB7U0Qyu+8ZXn05+zdFPXJ73LKc7DCcLkppRXJsdHLSDEFdWqFnV7o08B4qZkPMT4pmvhwhY0Pf1fwavOqxuTstzw18gUGyQzl0foQi0Qrmdazsp2Qw== emmet@snowfire" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDaeejVJwUVrIZSo1isbu+gkQ7+8ftCgCsczy3OclkEVWHyRTqlG6yp74hr3j8ZNsOhov7c2Q6RqC8oy669hlxi/y9BsvtlI7sBr94oAKFOmkCS4RiK72ngJjBvI0vbk89wQQjmAd3r8B7ZcedpNOC8CkHu8SebKdYPRIUvAbPc3fTEt7DsJkazAepZCB8LEhUp57FAqQ/Ezlt3X/1uwNq5S0EbE9Zm+nUpEfSqR9apY2neKWLyGiCxpK3dzyNOuulCxvtVz+ie2sTk/6SxM+qWEoVVxhdwyxPihEjgC0EvtG0S5mVh5JmcjRkJOzzBHJuw+6r8yWn/AxGdIsoJ4rKNxH1XH1iLHgCraOLOUjUNlmejTcQPu6o92a79fdz2gCHT/BuIjfCW7MErAC3YSmF45TSur/kiWCBaTqYo06pgbQ3w1vKg7fievQlQzsutmg47RvJp6fb74yxuOdVg39cShQu/l8r6zqm21JAeUaaIp4P/0MrAIMOOVUhbK0QgsNElO4yn0ZKH8wGIF8xORh7ikxUIAyq8C41gjJiO2sAFJc3M8DhduQU3X0lHB7U0Qyu+8ZXn05+zdFPXJ73LKc7DCcLkppRXJsdHLSDEFdWqFnV7o08B4qZkPMT4pmvhwhY0Pf1fwavOqxuTstzw18gUGyQzl0foQi0Qrmdazsp2Qw== emmet@snowfire"
]; ];

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

@ -15,73 +15,70 @@
}; };
}; };
}; };
# TODO disabled for debugging config = {
# config = { environment.systemPackages = with pkgs; [
# environment.systemPackages = [ attic-client
# # TODO update script for config schema change (pkgs.writeScriptBin "phoenix" ''
# (pkgs.writeScriptBin "phoenix" '' if [ "$1" = "sync" ]; then
# if [ "$1" = "sync" ]; then if [ "$#" = 1 ]; then
# if [ "$#" = 1 ]; then ${config.systemSettings.dotfilesDir}/scripts/sync.sh;
# ''+config.systemSettings.dotfilesDir+''/scripts/sync.sh; exit 0;
# exit 0; fi
# elif [ "$2" = "user" ]; then elif [ "$1" = "refresh" ]; then
# ''+config.systemSettings.dotfilesDir+''/scripts/sync-user.sh; if [ "$#" -gt 1 ]; then
# exit 0; echo "Warning: The 'refresh' command has no subcommands (no $2 subcommand)";
# elif [ "$2" = "system" ]; then fi
# ''+config.systemSettings.dotfilesDir+''/scripts/sync-system.sh; ${config.systemSettings.dotfilesDir}/scripts/sync-posthook.sh;
# exit 0; exit 0;
# else elif [ "$1" = "update" ]; then
# echo "Please pass 'system' or 'user' if supplying a second argument" ${config.systemSettings.dotfilesDir}/scripts/update.sh "''${@:2}";
# fi exit 0;
# elif [ "$1" = "refresh" ]; then elif [ "$1" = "upgrade" ]; then
# if [ "$#" -gt 1 ]; then if [ "$#" -gt 1 ]; then
# echo "Warning: The 'refresh' command has no subcommands (no $2 subcommand)"; echo "Warning: The 'upgrade' command has no subcommands (no $2 subcommand)";
# fi fi
# ''+config.systemSettings.dotfilesDir+''/scripts/sync-posthook.sh; ${config.systemSettings.dotfilesDir}/scripts/upgrade.sh;
# exit 0; exit 0;
# elif [ "$1" = "update" ]; then elif [ "$1" = "pull" ]; then
# ''+config.systemSettings.dotfilesDir+''/scripts/update.sh "''${@:2}"; if [ "$#" -gt 1 ]; then
# exit 0; echo "Warning: The 'pull' command has no subcommands (no $2 subcommand)";
# elif [ "$1" = "upgrade" ]; then fi
# if [ "$#" -gt 1 ]; then ${config.systemSettings.dotfilesDir}/scripts/pull.sh;
# echo "Warning: The 'upgrade' command has no subcommands (no $2 subcommand)"; exit 0;
# fi elif [ "$1" = "build" ]; then
# ''+config.systemSettings.dotfilesDir+''/scripts/upgrade.sh; if [ "$#" -gt 1 ]; then
# exit 0; echo "Warning: The 'pull' command has no subcommands (no $2 subcommand)";
# elif [ "$1" = "pull" ]; then fi
# if [ "$#" -gt 1 ]; then ${config.systemSettings.dotfilesDir}/scripts/build.sh;
# echo "Warning: The 'pull' command has no subcommands (no $2 subcommand)"; exit 0;
# fi elif [ "$1" = "harden" ]; then
# ''+config.systemSettings.dotfilesDir+''/scripts/pull.sh; if [ "$#" -gt 1 ]; then
# exit 0; echo "Warning: The 'harden' command has no subcommands (no $2 subcommand)";
# elif [ "$1" = "harden" ]; then fi
# if [ "$#" -gt 1 ]; then ${config.systemSettings.dotfilesDir}/scripts/harden.sh;
# echo "Warning: The 'harden' command has no subcommands (no $2 subcommand)"; exit 0;
# fi elif [ "$1" = "soften" ]; then
# ''+config.systemSettings.dotfilesDir+''/scripts/harden.sh; if [ "$#" -gt 1 ]; then
# exit 0; echo "Warning: The 'soften' command has no subcommands (no $2 subcommand)";
# elif [ "$1" = "soften" ]; then fi
# if [ "$#" -gt 1 ]; then ${config.systemSettings.dotfilesDir}/scripts/soften.sh;
# echo "Warning: The 'soften' command has no subcommands (no $2 subcommand)"; exit 0;
# fi elif [ "$1" = "gc" ]; then
# ''+config.systemSettings.dotfilesDir+''/scripts/soften.sh; if [ "$#" -gt 2 ]; then
# exit 0; echo "Warning: The 'gc' command only accepts one argument (collect_older_than)";
# elif [ "$1" = "gc" ]; then fi
# if [ "$#" -gt 2 ]; then if [ "$2" = "full" ]; then
# echo "Warning: The 'gc' command only accepts one argument (collect_older_than)"; sudo nix-collect-garbage --delete-old;
# fi nix-collect-garbage --delete-old;
# if [ "$2" = "full" ]; then elif [ "$2" ]; then
# sudo nix-collect-garbage --delete-old; sudo nix-collect-garbage --delete-older-than $2;
# nix-collect-garbage --delete-old; nix-collect-garbage --delete-older-than $2;
# elif [ "$2" ]; then else
# sudo nix-collect-garbage --delete-older-than $2; sudo nix-collect-garbage --delete-older-than 30d;
# nix-collect-garbage --delete-older-than $2; nix-collect-garbage --delete-older-than 30d;
# else fi
# sudo nix-collect-garbage --delete-older-than 30d; fi
# nix-collect-garbage --delete-older-than 30d; '')
# fi ];
# fi };
# '')
# ];
# };
} }

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

@ -24,7 +24,7 @@ in {
userSettings.spawnBrowser = lib.mkMerge [ userSettings.spawnBrowser = lib.mkMerge [
(lib.mkIf ((browser == "brave") || (browser == "librewolf")) browser) (lib.mkIf ((browser == "brave") || (browser == "librewolf")) browser)
(lib.mkIf (!(config.userSettings.hyprland.hyprprofiles.enable) && (browser == "qutebrowser")) "qutebrowser --qt-flag ignore-gpu-blacklist --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag enable-accelerated-2d-canvas --qt-flag num-raster-threads=4") (lib.mkIf (!(config.userSettings.hyprland.hyprprofiles.enable) && (browser == "qutebrowser")) "qutebrowser --qt-flag ignore-gpu-blacklist --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag enable-accelerated-2d-canvas --qt-flag num-raster-threads=4")
(lib.mkIf config.userSettings.hyprland.hyprprofiles.enable "qutebrowser-hyprprofile") (lib.mkIf (config.userSettings.hyprland.hyprprofiles.enable && (browser == "qutebrowser")) "qutebrowser-hyprprofile")
(lib.mkIf (browser == null) "") (lib.mkIf (browser == null) "")
]; ];
}; };

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

@ -13,7 +13,7 @@ in
}; };
}; };
config = { config = lib.mkIf cfg.enable {
userSettings.alacritty.enable = true; userSettings.alacritty.enable = true;
userSettings.kitty.enable = true; userSettings.kitty.enable = true;
userSettings.japanese.enable = true; userSettings.japanese.enable = true;

4
modules/user/plasma/default.nix
View File

@ -1,4 +1,4 @@
{config, lib, pkgs, ...}: {config, lib, pkgs, inputs, ...}:
let let
cfg = config.userSettings.plasma; cfg = config.userSettings.plasma;
in { in {
@ -8,6 +8,8 @@ in {
}; };
}; };
imports = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.plasma = { programs.plasma = {
enable = true; enable = true;

24
scripts/build.sh Executable file
View File

@ -0,0 +1,24 @@
#!/bin/sh
# Script to build all systems
# And push to attic cache
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
pushd $SCRIPT_DIR/.. &> /dev/null;
nixos-rebuild build --flake .#snowfire;
attic push emmet ./result;
rm ./result;
nixos-rebuild build --flake .#polarias;
attic push emmet ./result;
rm ./result;
nixos-rebuild build --flake .#zenith;
attic push emmet ./result;
rm ./result;
nixos-rebuild build --flake .#stardust;
attic push emmet ./result;
rm ./result;
nixos-rebuild build --flake .#ori;
attic push emmet ./result;
rm ./result;

3
scripts/install.sh
View File

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
## THIS DOESN'T WORK ANYMORE BTW
# TODO update this..
# Automated script to install my dotfiles # Automated script to install my dotfiles
# Clone dotfiles # Clone dotfiles

10
scripts/sync-system.sh
View File

@ -1,10 +0,0 @@
#!/bin/sh
# Script to synchronize system state
# with configuration files for nixos system
# and home-manager
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
# Rebuild system
sudo nixos-rebuild switch --flake $SCRIPT_DIR/..#system;

12
scripts/sync-user.sh
View File

@ -1,12 +0,0 @@
#!/bin/sh
# Script to synchronize system state
# with configuration files for nixos system
# and home-manager
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
# Install and build home-manager configuration
home-manager switch --flake $SCRIPT_DIR/..#user -b bkp;
$SCRIPT_DIR/sync-posthook.sh

7
scripts/sync.sh
View File

@ -6,5 +6,8 @@
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
$SCRIPT_DIR/sync-system.sh # Rebuild system
$SCRIPT_DIR/sync-user.sh sudo nixos-rebuild switch --flake $SCRIPT_DIR/..;
# Refresh
$SCRIPT_DIR/sync-posthook.sh

4
scripts/update.sh
View File

@ -4,8 +4,12 @@
# synchronizing configuration # synchronizing configuration
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
OUTOFDATEFLAKEREFS=(hyprland/hyprcursor)
# Update flake # Update flake
pushd $SCRIPT_DIR/.. &> /dev/null; pushd $SCRIPT_DIR/.. &> /dev/null;
sudo nix flake update "$@"; sudo nix flake update "$@";
if [ "$#" -eq 0 ]; then
sudo nix flake update $OUTOFDATEFLAKEREFS;
fi
popd &> /dev/null; popd &> /dev/null;