diff --git a/common/default.nix b/common/default.nix index 2d3f61a..cd01ff5 100644 --- a/common/default.nix +++ b/common/default.nix @@ -3,4 +3,6 @@ imports = [ ./users.nix ]; + + programs.zsh.enable = true; } diff --git a/common/home.nix b/common/home.nix index 9b2c1fc..7457602 100644 --- a/common/home.nix +++ b/common/home.nix @@ -1,7 +1,5 @@ { pkgs, - filter, - config, ... }: { @@ -18,11 +16,22 @@ nixd treefmt tealdeer + claude-code + gnome-extension-manager + lmstudio ]; home.sessionVariables = { SSH_AUTH_SOCK = "/home/strix/.bitwarden-ssh-agent.sock"; }; + + programs.zsh = { + enable = true; + oh-my-zsh = { + enable = true; + theme = "nanotech"; + }; + }; programs.git = { enable = true; @@ -32,7 +41,7 @@ init = { defaultBranch = "main"; }; }; }; - + dconf.settings = { "org/gnome/settings-daemon/plugins/media-keys" = { custom-keybindings = [ diff --git a/common/profile.png b/common/profile.png index eaa80e8..36b8dce 100644 Binary files a/common/profile.png and b/common/profile.png differ diff --git a/common/users.nix b/common/users.nix index b1d27a0..d92fc2a 100644 --- a/common/users.nix +++ b/common/users.nix @@ -1,4 +1,4 @@ -{ home-manager, inputs, filter, ... }: +{ home-manager, inputs, filter, pkgs, ... }: { imports = [ ../util/profile-icons.nix @@ -13,17 +13,19 @@ users.users."strix" = { isNormalUser = true; - icon = "${./common/profile.png}"; + icon = "${./profile.png}"; + shell = pkgs.zsh; description = "Strix"; initialPassword = "changeme"; extraGroups = [ "wheel" "networkmanager" "libvirtd" + "docker" ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMjsxlXIgj0sPuzjgfeqAfe1gTNAeFpAext2wbfjOLPE" ]; }; - + } diff --git a/devices/p14s/default.nix b/devices/p14s/default.nix index 95761c1..f91b54d 100644 --- a/devices/p14s/default.nix +++ b/devices/p14s/default.nix @@ -10,9 +10,16 @@ # secure boot shit environment.systemPackages = [ pkgs.sbctl ]; boot.loader.systemd-boot.enable = lib.mkForce false; + boot.lanzaboote = { enable = true; pkiBundle = "/var/lib/sbctl"; + autoGenerateKeys.enable = true; + autoEnrollKeys = { + enable = true; + autoReboot = true; + }; + configurationLimit = 5; }; # swap & hibernate @@ -28,9 +35,9 @@ memorySize = 8192; cores = 6; }; - + environment.systemPackages = with pkgs; [ - spice-vdagentd + spice-vdagent ]; }; diff --git a/styles/desktop.nix b/styles/desktop.nix index dd27ead..62dfc11 100644 --- a/styles/desktop.nix +++ b/styles/desktop.nix @@ -23,18 +23,16 @@ enable = true; theme = "bgrt"; package = pkgs.plymouth.overrideAttrs (old: { - postInstall = (old.postInstall or "") + '' - sed -i \ - -e 's/DialogClearsFirmwareBackground=true/DialogClearsFirmwareBackground=false/' \ - -e 's/DialogVerticalAlignment=.382/DialogVerticalAlignment=.55/' \ - -e 's/TitleVerticalAlignment=.382/TitleVerticalAlignment=.55/' \ - $out/share/plymouth/themes/bgrt/bgrt.plymouth - ''; - }); + postInstall = (old.postInstall or "") + '' + sed -i \ + -e 's/DialogClearsFirmwareBackground=true/DialogClearsFirmwareBackground=false/' \ + -e 's/DialogVerticalAlignment=.382/DialogVerticalAlignment=.55/' \ + -e 's/TitleVerticalAlignment=.382/TitleVerticalAlignment=.55/' \ + $out/share/plymouth/themes/bgrt/bgrt.plymouth + ''; + }); }; - - networking.networkmanager.enable = true; time.timeZone = "Europe/Amsterdam"; @@ -76,11 +74,20 @@ nixpkgs.config.allowUnfree = true; + programs.nix-ld.enable = true; + programs.firefox.enable = true; programs.virt-manager.enable = true; virtualisation.libvirtd.enable = true; + virtualisation.docker = { + enable = true; + autoPrune = { + dates = "weekly"; + }; + }; + nix = { settings = { auto-optimise-store = true; @@ -112,7 +119,7 @@ 8080 ]; networking.firewall.allowedUDPPorts = [ 8080 ]; - networking.firewall.trustedInterfaces = [ "virbr0" ]; + networking.firewall.trustedInterfaces = [ "virbr0" "docker0" ]; system.stateVersion = "26.05"; # yes diff --git a/util/profile-icons.nix b/util/profile-icons.nix index 620c634..ece3a9b 100644 --- a/util/profile-icons.nix +++ b/util/profile-icons.nix @@ -27,7 +27,7 @@ in }; }; - config = lib.mkIf config.services.xserver.displayManager.gdm.enable { + config = lib.mkIf config.services.displayManager.gdm.enable { boot.postBootCommands = with lib; strings.concatStrings bootCommands; }; } \ No newline at end of file