From 14c3f7ad1b466aa899d2413c513642eef2d15aeb Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 27 Aug 2025 21:43:18 -0500 Subject: [PATCH] swaylock broke --- home-manager/programs/default.nix | 2 +- home-manager/programs/hyprlock/default.nix | 14 +++ home-manager/programs/swaylock/default.nix | 12 -- .../configuration/homebox/default.nix | 2 +- .../configuration/laptop/default.nix | 2 +- system-config/configuration/live/default.nix | 108 ++++++++++-------- system-config/configuration/live/disko.nix | 93 +++++++++------ .../configuration/sandbox-nathan/default.nix | 2 +- 8 files changed, 135 insertions(+), 100 deletions(-) create mode 100644 home-manager/programs/hyprlock/default.nix delete mode 100644 home-manager/programs/swaylock/default.nix diff --git a/home-manager/programs/default.nix b/home-manager/programs/default.nix index 3711d8e..42dc540 100644 --- a/home-manager/programs/default.nix +++ b/home-manager/programs/default.nix @@ -8,7 +8,7 @@ ./terminal ./rofi ./pywal - ./swaylock + ./hyprlock ./calcurse ./firefox ]; diff --git a/home-manager/programs/hyprlock/default.nix b/home-manager/programs/hyprlock/default.nix new file mode 100644 index 0000000..0d4f6e8 --- /dev/null +++ b/home-manager/programs/hyprlock/default.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: { + + options.homeconfig.hyprlock.enable = lib.options.mkOption { + type = lib.types.bool; + default = false; + }; + + config = lib.mkIf config.homeconfig.hyprlock.enable { + + programs.hyprlock = { + enable = true; + }; + }; +} diff --git a/home-manager/programs/swaylock/default.nix b/home-manager/programs/swaylock/default.nix deleted file mode 100644 index d2841fb..0000000 --- a/home-manager/programs/swaylock/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, pkgs, ... }: { - - options.homeconfig.swaylock.enable = lib.options.mkOption { - type = lib.types.bool; - default = false; - }; - - config = lib.mkIf config.homeconfig.swaylock.enable { - - home.packages = with pkgs; [ swaylock-effects ]; - }; -} diff --git a/system-config/configuration/homebox/default.nix b/system-config/configuration/homebox/default.nix index b8904e8..c722ddd 100644 --- a/system-config/configuration/homebox/default.nix +++ b/system-config/configuration/homebox/default.nix @@ -134,7 +134,7 @@ homeconfig = { minimal = false; hyprland.enable = true; - swaylock.enable = true; + hyprlock.enable = true; wal.enable = true; mpd.enable = true; hyprpanel.enable = true; diff --git a/system-config/configuration/laptop/default.nix b/system-config/configuration/laptop/default.nix index 7f48651..0f7baf1 100644 --- a/system-config/configuration/laptop/default.nix +++ b/system-config/configuration/laptop/default.nix @@ -80,7 +80,7 @@ homeconfig = { minimal = false; hyprland.enable = true; - swaylock.enable = true; + hyprlock.enable = true; wal.enable = true; mpd.enable = true; hyprpanel.enable = true; diff --git a/system-config/configuration/live/default.nix b/system-config/configuration/live/default.nix index c5edb1c..ebfbfdf 100644 --- a/system-config/configuration/live/default.nix +++ b/system-config/configuration/live/default.nix @@ -1,16 +1,16 @@ -{ config, lib, pkgs, inputs, modulesPath, ... }: { +{ config, pkgs, inputs, modulesPath, ... }: { imports = with inputs; [ disko.nixosModules.default - (import ./disko.nix { device = "/dev/sda"; }) + (import ./disko.nix { device = "/dev/mmcblk0"; }) (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") - #sops-nix.nixosModules.sops + sops-nix.nixosModules.sops - #home-manager.nixosModules.default + home-manager.nixosModules.default ]; @@ -19,63 +19,75 @@ nixpkgs.hostPlatform = "x86_64-linux"; boot = { - #kernelPackages = pkgs.linuxKernel.packages.linux_6_6; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; }; - - /*sysconfig.opts = { - sddm.enable = true; - openssh.enable = false; - pipewire.enable = true; - hyprpanel.enable = true; - hyprland.enable = true; - git.enable = true; - nh.enable = true; - };*/ - - users.users."nathan" = { - isNormalUser = true; - initialPassword = "7567"; - extraGroups = [ "wheel" ]; - }; - - /*home-manager = { - backupFileExtension = "backup"; - extraSpecialArgs = { inherit inputs; }; + sysconfig = { + remoteBuildClient = true; + host = "live"; + graphical = true; users = { - "nathan" = lib.mkMerge [ - inputs.nathan-home-manager - { - config.homeconfig = { - hyprland.enable = true; - swaylock.enable = true; - wal.enable = true; - mpd.enable = true; - hyprpanel.enable = true; - calcurse.enable = true; - rofi.enable = true; - firefox.enable = true; - }; - } - ]; + nathan = { + extraGroups = [ "wheel" "networkmanager" ]; + hashedPasswordFile = config.sops.secrets."nathan/pass".path; + shell = pkgs.zsh; + home-manager = { + enable = true; + standalone = false; + extraModules = [ + { + homeconfig = { + minimal = false; + hyprland.enable = true; + hyprlock.enable = true; + wal.enable = true; + mpd.enable = true; + hyprpanel.enable = true; + calcurse.enable = true; + rofi.enable = true; + firefox.enable = true; + git.enable = true; + nh.enable = true; + }; + } + ]; + }; + }; }; - };*/ - system.stateVersion = "24.11"; + services = { + sddm.enable = true; + #openssh.enable = false; + pipewire.enable = true; + #kdePlasma6.enable = true; + netbird.enable = true; + #ollama.enable = true; + }; - nix = { - nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; - settings = { - experimental-features = [ "nix-command" "flakes" ]; + programs = { + #steam.enable = true; + hyprpanel.enable = true; + hyprland.enable = true; + }; + + + virtualization = { + + wyoming = { + enable = false; + }; + + homeassistant = { + enable = false; + }; }; }; - networking.hostName = "live"; + system.stateVersion = "25.05"; - fonts.packages = with pkgs; [ fira-code-nerdfont ]; + fonts.packages = with pkgs; [ nerd-fonts.fira-code ]; }; } diff --git a/system-config/configuration/live/disko.nix b/system-config/configuration/live/disko.nix index 9ad4f58..b2fb02c 100644 --- a/system-config/configuration/live/disko.nix +++ b/system-config/configuration/live/disko.nix @@ -1,45 +1,66 @@ { - device ? throw "Set this to your disk device, e.g. /dev/sda", + device1 ? throw "Set this to your disk device, e.g. /dev/sda", ... }: { disko.devices = { - disk = { - main = { - inherit device; - type = "disk"; - content = { - type = "gpt"; - partitions = { - boot = { - name = "boot"; - size = "1M"; - type = "EF02"; - priority = 1; + disk = { + main = { + device = device1; + type = "disk"; + content = { + type = "gpt"; + partitions = { + boot = { + name = "boot"; + size = "1M"; + type = "EF02"; + }; + esp = { + name = "ESP"; + size = "500M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + }; + }; + root = { + name = "root"; + size = "100%"; + content = { + type = "lvm_pv"; + vg = "root_vg"; + }; + }; + }; + }; }; - esp = { - name = "ESP"; - size = "500M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "unmask=0077" ]; - }; - }; - root = { - name = "root"; - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; }; - }; - }; + lvm_vg = { + root_vg = { + type = "lvm_vg"; + lvs = { + root = { + size = "100%FREE"; + content = { + type = "btrfs"; + extraArgs = ["-f"]; + subvolumes = { + "/root" = { + mountpoint = "/"; + }; + + "/nix" = { + mountOptions = ["subvol=nix" "noatime"]; + mountpoint = "/nix"; + }; + }; + }; + }; + }; + }; + }; }; } diff --git a/system-config/configuration/sandbox-nathan/default.nix b/system-config/configuration/sandbox-nathan/default.nix index 85cfa8b..a93f9a1 100644 --- a/system-config/configuration/sandbox-nathan/default.nix +++ b/system-config/configuration/sandbox-nathan/default.nix @@ -125,7 +125,7 @@ hyprland.enable = false; wal.enable = false; hyprpanel.enable = false; - swaylock.enable = true; + hyprlock.enable = false; mpd.enable = true; calcurse.enable = true; rofi.enable = true;