diff --git a/flake.lock b/flake.lock index d811ee7..1b23299 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1750684550, - "narHash": "sha256-uLtw0iF9mQ94L831NOlQLPX9wm0qzd5yim3rcwACEoM=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "fae816c55a75675f30d18c9cbdecc13b970d95d4", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1750742070, - "narHash": "sha256-IxbIMd6Z2+FPb9QCo95lJ4qcqaAYitSxB5Z+h3rM2Qo=", + "lastModified": 1750920307, + "narHash": "sha256-w1wJ6lxK1fMXwZe8yBjAeRoOCDqmx/fkwfCwrTqc1Rg=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d9f4e3e5952e267e8399b15759bbec90019f4515", + "rev": "da011a3510527ec378ec5504cb74ffc60fc67af7", "type": "github" }, "original": { @@ -188,11 +188,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1750722680, - "narHash": "sha256-li7cZUSJUhvjXC09GYS6u5PxBoVk2PGvqcdmINUGnhU=", + "lastModified": 1750889719, + "narHash": "sha256-QsH4nNNjYItfYwLU25JiAPBo/F5MMdaR3Ho29JdtyZw=", "owner": "neovim", "repo": "neovim", - "rev": "7f3249fa0de06cdcf4be1ed5f260d83cd9021dee", + "rev": "731e616a79d01e4797badbb4e18d167c51125151", "type": "github" }, "original": { @@ -223,11 +223,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750605355, - "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", + "lastModified": 1750836778, + "narHash": "sha256-sRLyRiC7TezRbbjGJwUFOgb2xMbSr3wQ0oJKfYlQ6s0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3078b9a9e75f1790e6d6ef9955fdc6a2d1740cc6", + "rev": "d7bb1922f0bb3d0c990f56f9cdb767fdb20a5f22", "type": "github" }, "original": { @@ -239,11 +239,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750622754, - "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", + "lastModified": 1750838302, + "narHash": "sha256-aVkL3/yu50oQzi2YuKo0ceiCypVZpZXYd2P2p1FMJM4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", + "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750731501, - "narHash": "sha256-Ah4qq+SbwMaGkuXCibyg+Fwn00el4KmI3XFX6htfDuk=", + "lastModified": 1750865895, + "narHash": "sha256-p2dWAQcLVzquy9LxYCZPwyUdugw78Qv3ChvnX755qHA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "69dfebb3d175bde602f612915c5576a41b18486b", + "rev": "61c0f513911459945e2cb8bf333dc849f1b976ff", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fd4ba17..4a8991f 100644 --- a/flake.nix +++ b/flake.nix @@ -79,13 +79,11 @@ nixosConfigurations = { dinky = mkHost [ ./hosts/dinky ]; nemo = mkHost [ ./hosts/nemo ]; - pearl = mkHost [ ./hosts/pearl ]; }; homeConfigurations = { "dln@dinky" = mkHome [ ./home/dln/dinky.nix ]; "dln@nemo" = mkHome [ ./home/dln/nemo.nix ]; - "dln@pearl" = mkHome [ ./home/dln/pearl.nix ]; }; }; } diff --git a/home/dln/pearl.nix b/home/dln/pearl.nix deleted file mode 100644 index 18a1715..0000000 --- a/home/dln/pearl.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./home.nix - ]; - - home.packages = with pkgs; [ - ]; -} diff --git a/hosts/pearl/apps.nix b/hosts/pearl/apps.nix deleted file mode 100644 index b856fea..0000000 --- a/hosts/pearl/apps.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - pkgs, - ... -}: -{ - programs.firefox.enable = true; - - environment.systemPackages = with pkgs; [ - calibre - gimp - gnomeExtensions.emoji-copy - gnomeExtensions.just-perfection - gnomeExtensions.vitals - gnome-pomodoro - gnome-tweaks - hitori - inkscape - krita - moonlight-qt - obsidian - pavucontrol - plexamp - signal-desktop - ]; - - environment.gnome.excludePackages = - [ - ]; - - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; - }; -} diff --git a/hosts/pearl/default.nix b/hosts/pearl/default.nix deleted file mode 100644 index 4696113..0000000 --- a/hosts/pearl/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ - inputs, - outputs, - lib, - config, - pkgs, - modulesPath, - ... -}: -{ - imports = [ - ./hardware-configuration.nix - ./apps.nix - ]; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - hardware.graphics = { - enable = true; - extraPackages = with pkgs; [ - vpl-gpu-rt - intel-media-driver - vaapiVdpau - libvdpau-va-gl - ]; - }; - - hardware.enableAllFirmware = true; - - services.printing.enable = true; - services.printing.drivers = [ pkgs.brlaser ]; - - networking = { - hostName = "pearl"; - domain = "aarn.patagia.net"; - search = [ - "patagia.dev" - "aarn.patagia.net" - ]; - useDHCP = lib.mkDefault true; - }; - - networking.networkmanager.enable = true; - networking.networkmanager.wifi.backend = "iwd"; - - time.timeZone = "Europe/Stockholm"; - - users.users = { - annso = { - isNormalUser = true; - description = "Ann-Sofie Stenberg"; - extraGroups = [ - "lp" - "video" - "audio" - "wheel" - ]; - }; - - dln = { - isNormalUser = true; - description = "Daniel Lundin"; - extraGroups = [ - "lp" - "wheel" - ]; - openssh.authorizedKeys.keys = [ - "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILwakA+EeuR23vRhjvjMkzK+FtWIhpnbs7z1pfnBehCUAAAABHNzaDo= dln@dinky" - "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIJNOBFoU7Cdsgi4KpYRcv7EhR/8kD4DYjEZnwk6urRx7AAAABHNzaDo= dln@nemo" - ]; - }; - }; - - patagia = { - desktop.enable = true; - laptop.enable = true; - plymouth.enable = true; - podman.enable = false; - }; - - systemd.services."getty@tty1".enable = false; - systemd.services."autovt@tty1".enable = false; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "se"; - # variant = "us"; - }; - - # Configure console keymap - console.keyMap = "sv-latin1"; - - # Enable sound with pipewire. - services.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; - - nixpkgs.config.allowUnfree = true; - - services.openssh.enable = true; - - system.stateVersion = "24.05"; # Did you read the comment? -} diff --git a/hosts/pearl/hardware-configuration.nix b/hosts/pearl/hardware-configuration.nix deleted file mode 100644 index f1105d5..0000000 --- a/hosts/pearl/hardware-configuration.nix +++ /dev/null @@ -1,38 +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" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/5ab8f3b9-4f74-4bc3-ac8e-3392a6120240"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4C5D-8244"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -}