Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swaylock broke

Browse Source
This commit is contained in:
Nathan
2025-08-27 21:43:18 -05:00
parent cbdc9b0d7c
commit 14c3f7ad1b
8 changed files with 135 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system-config/configuration/homebox/default.nix
View File

@@ -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;

2
system-config/configuration/laptop/default.nix
View File

@@ -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;

108
system-config/configuration/live/default.nix
View File

@@ -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 ];
};
}

93
system-config/configuration/live/disko.nix
View File

@@ -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";
};
};
};
};
};
};
};
};
}

2
system-config/configuration/sandbox-nathan/default.nix
View File

@@ -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;