add hypr stuff and remove current_system var fromflake

This commit is contained in:
2025-10-25 10:55:00 -05:00
parent 2d1d85ddc6
commit 6fa11eea8f
4 changed files with 44 additions and 14 deletions

22
flake.lock generated
View File

@@ -124,6 +124,27 @@
"type": "github"
}
},
"disko": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746728054,
"narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
"owner": "nix-community",
"repo": "disko",
"rev": "ff442f5d1425feb86344c028298548024f21256d",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "latest",
"repo": "disko",
"type": "github"
}
},
"firefox-gnome-theme": {
"flake": false,
"locked": {
@@ -419,6 +440,7 @@
"inputs": {
"autoaspm": "autoaspm",
"copyparty": "copyparty",
"disko": "disko",
"home-manager": "home-manager",
"nix-darwin": "nix-darwin",
"nix-homebrew": "nix-homebrew",

View File

@@ -19,6 +19,10 @@
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
disko = {
url = "github:nix-community/disko/latest";
inputs.nixpkgs.follows = "nixpkgs";
};
vpn-confinement = {
url = "github:Maroka-chan/VPN-Confinement";
};
@@ -51,20 +55,19 @@
};
stable_pkgs = builtins.mapAttrs (k: v: import nixpkgs {system = v;}) systems;
unstable_pkgs = builtins.mapAttrs (k: v: import nixpkgs-unstable {system = v;}) systems;
current_system = builtins.currentSystem;
in {
nixosConfigurations = {
snowbelle = nixpkgs.lib.nixosSystem {
system = systems.x86_64;
specialArgs = {inherit inputs stable_pkgs unstable_pkgs current_system;};
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
modules = [
./hosts/nixos/snowbelle/configuration.nix
inputs.home-manager.nixosModules.default
];
};
yveltal = nixpkgs.lib.nixosSystem {
yveltal = nixpkgs-unstable.lib.nixosSystem {
system = systems.x86_64;
specialArgs = {inherit inputs stable_pkgs unstable_pkgs current_system;};
specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
modules = [
./hosts/nixos/yveltal/configuration.nix
inputs.home-manager.nixosModules.default
@@ -82,7 +85,7 @@
darwinConfigurations = {
CEN-IT-07 = nix-darwin.lib.darwinSystem {
system = systems.darwin;
specialArgs = {inherit inputs stable_pkgs unstable_pkgs nix-homebrew current_system;};
specialArgs = {inherit inputs stable_pkgs unstable_pkgs nix-homebrew;};
modules = [
./hosts/darwin/cen-it-07/configuration.nix
inputs.home-manager.darwinModules.default

View File

@@ -8,8 +8,7 @@
# enable hyprland
programs.hyprland.enable = true;
# hint to election apps wayland is in use
environment.sessionVariables.NIXOS_OZONE_WL = "1";
# give hyprlock perms to unlock
security.pam.services.hyprlock = {};
}

View File

@@ -3,11 +3,19 @@
config,
...
}: {
home.packages = with pkgs; [nwg-displays];
home.packages = with pkgs; [
nwg-displays
hyprlock
hypridle
hyprpaper
];
wayland.windowManager.hyprland = {
enable = true;
systemd.variables = ["--all"];
settings = {
};
};
home.pointerCursor = {
@@ -18,9 +26,7 @@
size = 48;
};
xdg.configFile."hypr/hyprland.conf" = {
source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/hypr/hyprland.conf";
};
#xdg.configFile."hypr/hyprland.conf" = {
# source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/hypr/hyprland.conf";
#};
}