diff --git a/flake.lock b/flake.lock index 3ed83fb..f958a84 100644 --- a/flake.lock +++ b/flake.lock @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1768912518, - "narHash": "sha256-FJlof1jnbLIT5RbKxef/NV6RzcOj1GoMzXE4FcBFg5Y=", + "lastModified": 1768598210, + "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", "owner": "nix-community", "repo": "home-manager", - "rev": "9c5f8aceb6ef620e881f50fe65cb4a2c6b1e8527", + "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", "type": "github" }, "original": { @@ -254,11 +254,11 @@ ] }, "locked": { - "lastModified": 1768598210, - "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1768434960, - "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -294,11 +294,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1768835187, - "narHash": "sha256-6nY0ixjGjPQCL+/sUC1B1MRiO1LOI3AkRSIywm3i3bE=", + "lastModified": 1767822991, + "narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=", "owner": "nix-community", "repo": "impermanence", - "rev": "0d633a69480bb3a3e2f18c080d34a8fa81da6395", + "rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5", "type": "github" }, "original": { @@ -350,11 +350,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1768904356, - "narHash": "sha256-TIG8J+Or8nOydy8TztvtIshnprlf1q6XDIJnopLtMlA=", + "lastModified": 1768475717, + "narHash": "sha256-185VOlWF4K9gzwr7M56ArjqDt6beN/5TxCYLEyVPOcs=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "d95b25a4dd6da2a1dfeaaf66163d0a281a8270e9", + "rev": "a579610c67dc946f39c2a64656699eb29eb2ffb5", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -573,11 +573,11 @@ ] }, "locked": { - "lastModified": 1768863606, - "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=", + "lastModified": 1768481291, + "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2", + "rev": "e085e303dfcce21adcb5fec535d65aacb066f101", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768744881, - "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", + "lastModified": 1768603455, + "narHash": "sha256-ih6dYNhX1oSg0emfSAvf3iRcgsJtMmS6RUaoCX8kNoU=", "owner": "danth", "repo": "stylix", - "rev": "06684f00cfbee14da96fd4307b966884de272d3a", + "rev": "590e5c68c4d5e8c766420473c0185d75113f653b", "type": "github" }, "original": { @@ -794,11 +794,11 @@ ] }, "locked": { - "lastModified": 1768857659, - "narHash": "sha256-93pj/A2s26CUZwvCpN0CL6a1NhLpYVzidzc/Vk2GKCI=", + "lastModified": 1768638486, + "narHash": "sha256-+LC0wOiliUXbIj6zT2hCoOQ0zn33BD2NxGoy0QqP3Eo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3a42efe341d068f13ffb961ed832474128b844f3", + "rev": "76bbc35c59419b8b0616fb779ce5600e85edab11", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ff6de6a..f478b06 100644 --- a/flake.nix +++ b/flake.nix @@ -67,9 +67,6 @@ # work murk = utils.mkHost ./hosts/murk/configuration.nix; - # work desktop - musk = utils.mkHost ./hosts/musk/configuration.nix; - # lenovo muvo = utils.mkHost ./hosts/muvo/configuration.nix; diff --git a/hosts/murk/home.nix b/hosts/murk/home.nix index 706f35d..a16adb5 100644 --- a/hosts/murk/home.nix +++ b/hosts/murk/home.nix @@ -19,7 +19,6 @@ in { mods.terminal.emulator.enable = true; mods.terminal.development.enable = true; mods.terminal.tools.enable = true; - mods.terminal.hr.enable = true; mods.desktop.development.enable = true; mods.desktop.productivity.enable = false; mods.zen.enable = true; diff --git a/hosts/musk/configuration.nix b/hosts/musk/configuration.nix deleted file mode 100644 index b9868c3..0000000 --- a/hosts/musk/configuration.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - system, - sources, - modulesPath, - ... -}: let - cfg = config.mods; - keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEio+Y5wBVD1wILaH2R3wV10FvVjiqy/4gGBWHOITTB muon@muon" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKevYmkH7xvYoquBjnYZ7PJiVqf+GOh9fxAJBN6wZGBB gin4@hi.is" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILmAOd9VbhyJeibt6Vrb101MNTk5W8+rh94Djv/C+pyu muon@muho" - ]; -in { - # Hardware - imports = [ - ./hardware-configuration.nix - "${ - builtins.fetchTarball { - url = "https://github.com/nix-community/disko/archive/refs/tags/v1.12.0.tar.gz"; - sha256 = "0wbx518d2x54yn4xh98cgm65wvj0gpy6nia6ra7ns4j63hx14fkq"; - } - }/module.nix" - ./disk-config.nix - # (inputs.nixpkgs - # + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") - ]; - - environment.systemPackages = with inputs.nix-alien.packages.${system}; [ - nix-alien - pkgs.libratbag - pkgs.piper - pkgs.libpq - pkgs.qmk - pkgs.jq - pkgs.wireguard-tools - pkgs.opencode - ]; - - boot.binfmt = { - emulatedSystems = ["aarch64-linux"]; - preferStaticEmulators = true; # Make it work with Docker - }; - - # System - mods.user.name = "muon"; - networking.hostName = "musk"; - networking.hostId = "a2309091"; - mods.home.file = ./home.nix; - nix.settings.trusted-users = ["root" "muon"]; - users.users.muon.extraGroups = ["docker"]; - - # Modules - mods.desktop.enable = true; - mods.boot.enable = true; - - mods.theme.enable = true; - mods.theme.scheme = "woodland"; - mods.theme.wallpaper = ./wallpaper.png; - - services.xserver.windowManager.i3.enable = true; - # mods.desktop.wayland.enable = true; - - mods.impermanence.enable = true; - - virtualisation.docker.enable = true; - - users.users.muon.openssh.authorizedKeys.keys = keys; - users.users.root.openssh.authorizedKeys.keys = keys; - - # Persist - environment.persistence."/persist" = { - directories = ["/etc/NetworkManager" "/var/lib/NetworkManager"]; - }; - - # Hardware preferences - environment.variables = { - WINIT_HIDPI_FACTOR = "1"; - WINIT_X11_SCALE_FACTOR = "1"; - }; - - ## Monitors - mods.monitors = { - primary = { - name = "DP-1"; - config = { - enable = true; - mode = "2560x1440"; - position = "0x0"; - rate = "60.00"; - dpi = 72; - }; - }; - right = { - name = "HDMI-1"; - config = { - enable = true; - mode = "2560x1440"; - position = "2560x0"; - rate = "60.00"; - dpi = 72; - }; - }; - }; - - ## Mouse - services.libinput.mouse.accelProfile = "flat"; - - ## Keyboard - hardware.keyboard.qmk.enable = true; - - # Version of first install - system.stateVersion = "23.05"; -} diff --git a/hosts/musk/disk-config.nix b/hosts/musk/disk-config.nix deleted file mode 100644 index 05a9f01..0000000 --- a/hosts/musk/disk-config.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - disko.devices = { - disk = { - main = { - type = "disk"; - device = "/dev/sda"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - # disable settings.keyFile if you want to use interactive password entry - #passwordFile = "/tmp/secret.key"; # Interactive - # settings = { - # allowDiscards = true; - # keyFile = "/tmp/secret.key"; - # }; - # additionalKeyFiles = [ "/tmp/additionalSecret.key" ]; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/home" = { - mountpoint = "/home"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/persist" = { - mountpoint = "/persist"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/log" = { - mountpoint = "/var/log"; - mountOptions = [ "compress=zstd" "noatime" ]; - }; - "/swap" = { - mountpoint = "/swap"; - swap.swapfile.size = "4G"; - }; - }; - }; - }; - }; - }; - }; - }; - }; - }; - - fileSystems."/persist".neededForBoot = true; - fileSystems."/var/log".neededForBoot = true; -} diff --git a/hosts/musk/hardware-configuration.nix b/hosts/musk/hardware-configuration.nix deleted file mode 100644 index 332920b..0000000 --- a/hosts/musk/hardware-configuration.nix +++ /dev/null @@ -1,18 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/musk/home.nix b/hosts/musk/home.nix deleted file mode 100644 index 0bd1d49..0000000 --- a/hosts/musk/home.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - pkgs, - lib, - config, - osConfig, - inputs, - ... -}: let - cfg = osConfig.mods; -in { - # Modules - mods.xdg.enable = true; - mods.i3.enable = true; - # mods.hyprland.enable = true; - mods.terminal.zsh.enable = true; - mods.terminal.emulator.enable = true; - mods.terminal.development.enable = true; - mods.terminal.tools.enable = true; - mods.terminal.hr.enable = true; - mods.desktop.development.enable = true; - mods.desktop.productivity.enable = false; - mods.zen.enable = true; - - home.packages = with pkgs; - [ - thunderbird - pulseaudio - pavucontrol - alsa-utils - rustdesk-flutter - - # tools - docker - fish - devenv - dbeaver-bin - ruff - just - go - rainfrog - tealdeer - gh - (callPackage ./packages/mender-cli.nix {}) - ] - # Non-free /dev/null; then - devenv init - echo "Direnv allowed" - else - echo "Error: devenv not found in path." - exit 1 - fi - - if [ -f .gitignore.bak ]; then - mv .gitignore.bak .gitignore - elif [ -f .gitignore ]; then - rm .gitignore - fi - - # 2. Replace devenv.nix - cat <devenv.nix -{pkgs, ...}: { - packages = [ pkgs.google-cloud-sdk ]; - - languages.python = { - enable = true; - venv.enable = true; - uv = { - enable = true; - sync.enable = false; - }; - }; - - # We use the named index "google" defined in uv.toml - env.UV_INDEX_GOOGLE_USERNAME = "oauth2accesstoken"; - - enterShell = '' - if ! gcloud auth print-access-token >/dev/null 2>&1; then - echo "⚠️ gcloud not authenticated. Run 'gcloud auth login' to access Google Artifact Registry." - else - export UV_INDEX_GOOGLE_PASSWORD=\$(gcloud auth print-access-token) - fi - uv sync - ''; -} -EOF - - cat <uv.toml -[[index]] -name = "google" -url = "https://europe-west1-python.pkg.dev/mk2-prod/python-packages/simple/" -EOF - - # 3. Add to local git exclude - if git rev-parse --git-dir >/dev/null 2>&1; then - EXCLUDE_FILE=$(git rev-parse --git-path info/exclude) - mkdir -p "$(dirname "$EXCLUDE_FILE")" - - IGNORES=( - ".devenv*" - ".direnv" - "devenv.nix" - "devenv.yaml" - "devenv.lock" - "uv.lock" - "uv.toml" - ".envrc" - ) - - for file in "${IGNORES[@]}"; do - if ! grep -Fxq "$file" "$EXCLUDE_FILE" 2>/dev/null; then - echo "$file" >>"$EXCLUDE_FILE" - echo "Added $file to local git exclude ($EXCLUDE_FILE)" - fi - done - else - echo "Warning: Not a git repository. Skipping git ignore setup." - fi - - # 4. Allow direnv - if command -v direnv >/dev/null; then - direnv allow - echo "Direnv allowed" - else - echo "Error: direnv not found in path." - exit 1 - fi - -else - echo "Usage: hr py init" - echo " py init Initialize a python devenv environment (git-ignored)" - exit 1 -fi