diff --git a/flake.nix b/flake.nix index 051246b..adc41e0 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,10 @@ ]; }; }; - systems = [system]; + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; }; inputs = { diff --git a/home/services/udiskie.nix b/home/services/udiskie.nix index ec14b10..b046519 100644 --- a/home/services/udiskie.nix +++ b/home/services/udiskie.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { services.udiskie = { - enable = false; + enable = true; settings = { program_options = { file_manager = "${pkgs.nautilus}/bin/nautilus"; diff --git a/home/system/packages/default.nix b/home/system/packages/default.nix index 44d16d8..871fe92 100644 --- a/home/system/packages/default.nix +++ b/home/system/packages/default.nix @@ -9,6 +9,7 @@ # derivations (callPackage ./derivations/bunnyfetch {}) + (callPackage ./derivations/ubports-installer {}) #fonts (google-fonts.override {fonts = ["Poppins" "Inter" "Roboto Mono"];}) @@ -26,6 +27,7 @@ # utilites wl-clipboard xclip + waypipe # cli sops @@ -36,6 +38,7 @@ nix-output-monitor eza bat + quickemu distrobox #net diff --git a/home/system/packages/derivations/ubports-installer/default.nix b/home/system/packages/derivations/ubports-installer/default.nix index 361d90e..ca9801a 100644 --- a/home/system/packages/derivations/ubports-installer/default.nix +++ b/home/system/packages/derivations/ubports-installer/default.nix @@ -6,7 +6,7 @@ }: let pname = "ubports-installer"; - icon = ./ubports-mascot.jpg; + icon = ./ubports-mascot.png; desktopItems = [ (makeDesktopItem { @@ -28,14 +28,11 @@ in src = fetchurl { url = "https://github.com/ubports/ubports-installer/releases/download/${version}/ubports-installer_${version}_linux_x86_64.AppImage"; - hash = "sha256-oUQ4AaRiUMeklyI4xzH+krXyedqpLiA9obo5uO8JJak="; + hash = "sha256-RmSim4dJMCQsw+lFN17dhuL5AqfHNLyiDYQtzO5gymU="; }; extraInstallCommands = - '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - '' - + lib.concatMapStringsSep "\n " + lib.concatMapStringsSep "\n " (e: '' install -Dm444 -t $out/share/applications ${e}/share/applications/*.desktop '') diff --git a/home/theming/stylix.nix b/home/theming/stylix.nix index a03cb68..62804cb 100644 --- a/home/theming/stylix.nix +++ b/home/theming/stylix.nix @@ -21,6 +21,7 @@ in { base16Scheme = mkOption { type = types.str; + default = config.stylix.generated.palette; }; }; diff --git a/hosts/common/services/podman.nix b/hosts/common/services/podman.nix deleted file mode 100644 index e31c3ac..0000000 --- a/hosts/common/services/podman.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - virtualisation.podman = { - enable = true; - dockerCompat = true; - }; -} diff --git a/hosts/common/system/boot.nix b/hosts/common/system/boot.nix index 5d47ee7..de01a5e 100644 --- a/hosts/common/system/boot.nix +++ b/hosts/common/system/boot.nix @@ -6,7 +6,7 @@ }: { boot = { kernelPackages = pkgs.linuxPackages_zen; - kernelModules = []; + kernelModules = ["i2c-dev" "ddcci_backlight"]; extraModulePackages = with config.boot.kernelPackages; [ amneziawg ]; @@ -17,5 +17,6 @@ loader.efi.canTouchEfiVariables = true; binfmt.emulatedSystems = ["aarch64-linux"]; + tmp.useTmpfs = true; }; } diff --git a/hosts/common/system/users.nix b/hosts/common/system/users.nix index a50f8c6..78f3123 100644 --- a/hosts/common/system/users.nix +++ b/hosts/common/system/users.nix @@ -12,7 +12,9 @@ "podman" "adbusers" "kvm" + "i2c" ]; + uid = 1000; subGidRanges = [ { count = 65536; @@ -25,7 +27,6 @@ startUid = 100000; } ]; - packages = []; useDefaultShell = true; openssh.authorizedKeys = { keys = [ @@ -35,5 +36,9 @@ }; shell = pkgs.fish; }; + groups = { + adbusers = {}; + i2c = {}; + }; }; } diff --git a/universe.nix b/universe.nix index 900dcfb..1f77279 100644 --- a/universe.nix +++ b/universe.nix @@ -5,8 +5,8 @@ waybar.enable = true; }; theme.stylix = { - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml"; - wallpapers = ./wallpapers.jpg; + # base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml"; + wallpapers = ./wallpaper.png; useLutgen = false; }; }; diff --git a/wallpapers.jpg b/wallpapers.jpg deleted file mode 100644 index d0d18f4..0000000 Binary files a/wallpapers.jpg and /dev/null differ