From bbd9d5974f09b3620ee711e55046c45db347dcbf Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 21 Jun 2024 10:45:06 -0400 Subject: [PATCH] Cleaned up desktop on framework --- flake.nix | 2 +- hosts/fwbook.hardware-configuration.nix | 2 +- modules/desktop/default.nix | 3 +-- modules/desktop/hyprland.nix | 17 ++++------------- modules/os/docker.nix | 12 ++++-------- 5 files changed, 11 insertions(+), 25 deletions(-) diff --git a/flake.nix b/flake.nix index cc86f3a..ae814f4 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ enable = true; user = user; enableKDE = true; - enableHypr = true; + enableHypr = false; enableX11 = true; enableWine = true; }; diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index eddda11..e732e4c 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -38,7 +38,7 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.br-74ce7d3722b8.useDHCP = lib.mkDefault true; - # networking.interfaces.docker0.useDHCP = lib.mkDefault true; + networking.interfaces.docker0.useDHCP = lib.mkDefault true; # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; # networking.interfaces.vethdb1ba40.useDHCP = lib.mkDefault true; # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 0b20f00..50468cb 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -19,8 +19,6 @@ # Personal Desktop App users.users.${user.name}.packages = with pkgs; [ # web - firefox - librewolf brave # password bitwarden-desktop @@ -47,6 +45,7 @@ # terminal alacritty alacritty-theme + kitty ]; # udev rules for crypto wallets services.udev.packages = with pkgs; [ ledger-udev-rules trezor-udev-rules ]; diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 863c614..e81ebc1 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -1,12 +1,7 @@ { user }: -{ pkgs, ... }: -{ - programs.hyprland = { - enable = true; - }; - environment.sessionVariables = { - NIXOS_OZONE_WL = "1"; - }; +{ pkgs, ... }: { + programs.hyprland = { enable = true; }; + environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; programs.waybar.enable = false; environment.systemPackages = with pkgs; [ # common utilities @@ -15,8 +10,6 @@ mpv gcc xdg-desktop-portal - # apps - kitty # sound pavucontrol # notification daemon @@ -58,7 +51,5 @@ ]; services.mpd.enable = true; services.pipewire.wireplumber.enable = true; - users.users.${user.name}.extraGroups = [ - "input" - ]; + users.users.${user.name}.extraGroups = [ "input" ]; } diff --git a/modules/os/docker.nix b/modules/os/docker.nix index 58da6ca..9648d1a 100644 --- a/modules/os/docker.nix +++ b/modules/os/docker.nix @@ -1,11 +1,7 @@ { user }: -{ pkgs, ... }: -{ +{ pkgs, ... }: { virtualisation.docker.enable = true; - environment.systemPackages = with pkgs; [ - docker-compose - ]; - users.users.${user.name}.extraGroups = [ - "docker" - ]; + virtualisation.docker.autoPrune.enable = true; + environment.systemPackages = with pkgs; [ docker-compose ]; + users.users.${user.name}.extraGroups = [ "docker" ]; }