From 457537462a39fb21fc00fe31855143b9327203f6 Mon Sep 17 00:00:00 2001 From: Vivian Date: Mon, 4 Mar 2024 15:22:52 +0100 Subject: [PATCH] minor updates --- common/desktop/home.nix | 2 +- common/hm-modules/catppuccin.nix | 58 +++++++++++++++++--------------- flake.lock | 18 +++++----- flake.nix | 1 - hosts/thalassa/aoife/default.nix | 4 --- hosts/thalassa/aoife/uni.nix | 4 ++- 6 files changed, 43 insertions(+), 44 deletions(-) diff --git a/common/desktop/home.nix b/common/desktop/home.nix index 16751cc0..ed78db3c 100644 --- a/common/desktop/home.nix +++ b/common/desktop/home.nix @@ -4,7 +4,7 @@ let inherit (pkgs.texlive) scheme-full; dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; }; }; - my-python-packages = ps: with ps; [ pandas requests numpy scapy pyshark ]; + my-python-packages = ps: with ps; [ pandas requests numpy scapy pyshark cryptography ]; in { home.packages = with pkgs; [ (python3.withPackages my-python-packages) diff --git a/common/hm-modules/catppuccin.nix b/common/hm-modules/catppuccin.nix index 68c7191e..e4c97c5a 100644 --- a/common/hm-modules/catppuccin.nix +++ b/common/hm-modules/catppuccin.nix @@ -3,38 +3,40 @@ with lib; let cfg = config.themes.v.catppuccin; in { options.themes.v.catppuccin = { enable = mkEnableOption "catppuccin"; }; - config = - let - theme = "Catppuccin-Pink-Dark"; - cursorTheme = config.home.pointerCursor.name; - in - mkIf cfg.enable { - home.pointerCursor = { - name = "Bibata_Ghost"; - size = 24; - package = pkgs.bibata-cursors-translucent; - }; + config = let + theme = "Catppuccin-Frappe-Pink-Dark"; + cursorTheme = config.home.pointerCursor.name; + in mkIf cfg.enable { + home.pointerCursor = { + name = "Bibata_Ghost"; + size = 24; + package = pkgs.bibata-cursors-translucent; + }; - gtk = { - enable = true; - theme = { - name = theme; - package = pkgs.catppuccin-gtk; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme.override { color = "violet"; }; - }; - cursorTheme = { - name = cursorTheme; - inherit (config.home.pointerCursor) package size; + gtk = { + enable = true; + theme = { + name = theme; + package = pkgs.catppuccin-gtk.override { + accents = [ "pink" ]; + variant = "frappe"; + size = "standard"; }; }; - - programs.vscode = { - userSettings."workbench.colorTheme" = "Catppuccin Frappé"; - extensions = [ pkgs.vscode-extensions.catppuccin.catppuccin-vsc ]; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme.override { color = "violet"; }; + }; + cursorTheme = { + name = cursorTheme; + inherit (config.home.pointerCursor) package size; }; }; + + programs.vscode = { + userSettings."workbench.colorTheme" = "Catppuccin Frappé"; + extensions = [ pkgs.vscode-extensions.catppuccin.catppuccin-vsc ]; + }; + }; } diff --git a/flake.lock b/flake.lock index 2f396887..19eba96b 100644 --- a/flake.lock +++ b/flake.lock @@ -837,11 +837,11 @@ ] }, "locked": { - "lastModified": 1708806879, - "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", + "lastModified": 1708988456, + "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", + "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", "type": "github" }, "original": { @@ -1412,11 +1412,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1708847675, - "narHash": "sha256-RUZ7KEs/a4EzRELYDGnRB6i7M1Izii3JD/LyzH0c6Tg=", + "lastModified": 1708954320, + "narHash": "sha256-n3LXNMlz7ORCjfIrIUo19a844Fec2+yg7k6NspdVCxs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a34566b67bef34c551f204063faeecc444ae9da", + "rev": "94cda73bf2fd675de987db7c3ac81e861b892266", "type": "github" }, "original": { @@ -1466,11 +1466,11 @@ }, "nur": { "locked": { - "lastModified": 1708938863, - "narHash": "sha256-RwqyijFuO+O6T4IX3eQk64j3zHQHBjNWlP57Mc2wyvY=", + "lastModified": 1709020581, + "narHash": "sha256-MXYbnsD71iTCem3/hZwMvmAQq/7uRGsLoaNn/nbWv04=", "owner": "nix-community", "repo": "NUR", - "rev": "3612172937c01525cc14646aea107cc764ed5cb2", + "rev": "8860cc9b5dfc855f648c5b8d47f23a0d456d4869", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 99eb4e3e..bd76733b 100644 --- a/flake.nix +++ b/flake.nix @@ -125,7 +125,6 @@ }; }; - # Outputs outputsBuilder = channels: { devShells.default = channels.nixpkgs.mkShell { diff --git a/hosts/thalassa/aoife/default.nix b/hosts/thalassa/aoife/default.nix index a3c31c0c..f47b388f 100644 --- a/hosts/thalassa/aoife/default.nix +++ b/hosts/thalassa/aoife/default.nix @@ -18,8 +18,6 @@ users.users.vivian.extraGroups = [ "adbusers" ]; - - # Bootloader. boot = { bootspec.enable = true; @@ -27,8 +25,6 @@ resumeDevice = "/dev/nvme0n1p2"; loader.systemd-boot.enable = lib.mkForce false; - kernelPackages = pkgs.linuxPackages_6_6; - kernel.sysctl = { "perf_event_paranoid" = 1; "kptr_restrict" = 0; diff --git a/hosts/thalassa/aoife/uni.nix b/hosts/thalassa/aoife/uni.nix index 620f5968..18e6464c 100644 --- a/hosts/thalassa/aoife/uni.nix +++ b/hosts/thalassa/aoife/uni.nix @@ -12,7 +12,9 @@ programs.wireshark.enable = true; programs.wireshark.package = pkgs.wireshark; - virtualisation.lxc.enable = true; + virtualisation.lxc.enable = false; + virtualisation.lxd.enable = false; + virtualisation.podman.enable = false; virtualisation.docker.enable = true; virtualisation.docker.storageDriver = "btrfs";