From 7b3bf7557d4cd2d3263425cbfa15350b4c3ed361 Mon Sep 17 00:00:00 2001 From: schererleander Date: Tue, 29 Jul 2025 02:04:35 +0200 Subject: chore: rename hosts --- hosts/darwin/configuration.nix | 71 -------------------------------- hosts/darwin/home.nix | 52 ------------------------ hosts/desktop/configuration.nix | 90 +++++++++++++++++++++++++++++++++++++++++ hosts/desktop/wooting.nix | 30 ++++++++++++++ hosts/macbook/configuration.nix | 49 ++++++++++++++++++++++ hosts/macbook/home.nix | 32 +++++++++++++++ hosts/nixos/configuration.nix | 90 ----------------------------------------- hosts/nixos/wooting.nix | 30 -------------- 8 files changed, 201 insertions(+), 243 deletions(-) delete mode 100644 hosts/darwin/configuration.nix delete mode 100644 hosts/darwin/home.nix create mode 100644 hosts/desktop/configuration.nix create mode 100644 hosts/desktop/wooting.nix create mode 100644 hosts/macbook/configuration.nix create mode 100644 hosts/macbook/home.nix delete mode 100644 hosts/nixos/configuration.nix delete mode 100644 hosts/nixos/wooting.nix (limited to 'hosts') diff --git a/hosts/darwin/configuration.nix b/hosts/darwin/configuration.nix deleted file mode 100644 index cc999a2..0000000 --- a/hosts/darwin/configuration.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ config, pkgs, lib, ...}: - -{ - nix.settings.experimental-features = "nix-command flakes"; - nixpkgs.hostPlatform = "aarch64-darwin"; - nixpkgs.config.allowUnfree = true; - - users.users.schererleander.home = "/Users/schererleander"; - - system.primaryUser = "schererleander"; - system.defaults = { - dock = { - autohide = true; - largesize = 48; - show-recents = false; - }; - WindowManager.EnableStandardClickToShowDesktop = false; - finder = { - #ShowPathbar = true; - #ShowStatusBar = true; - _FXShowPosixPathInTitle = true; - _FXSortFoldersFirst = true; - }; - controlcenter = { - Display = false; - FocusModes = false; - Sound = false; - }; - loginwindow.GuestEnabled = false; - }; - - programs.zsh.enable = true; - - homebrew = { - enable = true; - taps = [ - "vladdoster/formulae" - ]; - brews = [ - "keychain" - "openjdk@17" - "openjdk@21" - "plantuml" - "pinentry-mac" - "minio-mc" - ]; - casks = [ - "nextcloud" - "bambu-studio" - "vlc" - "vladdoster/formulae/vimari" - "arduino-ide" - "docker-desktop" - "anki" - "mongodb-compass" - "viscosity" - ]; - masApps = { - "Goodnotes 6" = 1444383602; - "WhatsApp Messenger " = 310633997; - "Adguard for Safari" = 1440147259; - "WireGuard" = 1451685025; - "Infuse" = 1136220934; - }; - onActivation.cleanup = "zap"; - onActivation.autoUpdate = true; - onActivation.upgrade = true; - }; - - system.stateVersion = 5; -} diff --git a/hosts/darwin/home.nix b/hosts/darwin/home.nix deleted file mode 100644 index 3a10980..0000000 --- a/hosts/darwin/home.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ config, lib, pkgs, inputs, ...}: - -{ - imports = [ - ../../modules - ]; - - home.username = "schererleander"; - home.homeDirectory = "/Users/schererleander"; - - home.packages = with pkgs; [ - htop - ffmpeg - pfetch - wget - imagemagick - mas - - #dev - gcc - maven - cmake - gnupg - pinentry-curses - lua-language-server - pyright - go - nodejs - typst - tailwindcss - - obsidian - iterm2 - appcleaner - rectangle - jetbrains.idea-community-bin - - nerd-fonts.symbols-only - nerd-fonts.space-mono - ]; - - zsh.enable = true; - tmux.enable = true; - git.enable = true; - nvf.enable = true; - - spicetify.enable = true; - zathura.enable = true; - vscode.enable = true; - - home.stateVersion = "25.05"; -} diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix new file mode 100644 index 0000000..9cee9a7 --- /dev/null +++ b/hosts/desktop/configuration.nix @@ -0,0 +1,90 @@ +{ config, pkgs, ... }: + +{ + imports = + [ + ./hardware-configuration.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Use latest kernel. + boot.kernelPackages = pkgs.linuxPackages_latest; + + networking.hostName = "nixos"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Enable networking + networking.networkmanager.enable = true; + + # Disable wait online + systemd.services.NetworkManager-wait-online.enable = false; + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Select internationalisation properties. + i18n.defaultLocale = "de_DE.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; + + # Configure console keymap + console.keyMap = "de"; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # 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; + }; + + users.users.schererleander = { + isNormalUser = true; + description = "schererleander"; + extraGroups = [ "networkmanager" "wheel" "video" "input" ]; + ]; + }; + + programs.firefox.enable = true; + programs.steam.enable = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + environment.systemPackages = with pkgs; [ + neovim + git + ]; + + services.openssh.enable = true; + + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + system.stateVersion = "25.05"; + +} diff --git a/hosts/desktop/wooting.nix b/hosts/desktop/wooting.nix new file mode 100644 index 0000000..e6217cd --- /dev/null +++ b/hosts/desktop/wooting.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +{ + options.wooting.enable = lib.mkEnableOption "Enable Wooting udev rules"; + config = lib.mkIf config.wooting.enable { + services.udev.extraRules = '' + # Wooting One Legacy + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" + + # Wooting One update mode + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess" + + # Wooting Two Legacy + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" + + # Wooting Two update mode + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess" + + # Generic Wootings + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess" + ''; + + environment.systemPackages = with pkgs; [ + wootility + ]; + }; +} \ No newline at end of file diff --git a/hosts/macbook/configuration.nix b/hosts/macbook/configuration.nix new file mode 100644 index 0000000..e7613de --- /dev/null +++ b/hosts/macbook/configuration.nix @@ -0,0 +1,49 @@ +{ config, pkgs, lib, ...}: + +{ + nix.settings.experimental-features = "nix-command flakes"; + nixpkgs.hostPlatform = "aarch64-darwin"; + nixpkgs.config.allowUnfree = true; + + users.users.schererleander.home = "/Users/schererleander"; + + system.primaryUser = "schererleander"; + system.defaults = { + dock = { + autohide = true; + largesize = 48; + show-recents = false; + }; + WindowManager.EnableStandardClickToShowDesktop = false; + finder = { + #ShowPathbar = true; + #ShowStatusBar = true; + _FXShowPosixPathInTitle = true; + _FXSortFoldersFirst = true; + }; + controlcenter = { + Display = false; + FocusModes = false; + Sound = false; + }; + loginwindow.GuestEnabled = false; + }; + + homebrew = { + enable = true; + brews = [ + "openjdk@21" + ]; + casks = [ + "nextcloud" + "bambu-studio" + "arduino-ide" + "anki" + ]; + onActivation.cleanup = "zap"; + onActivation.autoUpdate = true; + onActivation.upgrade = true; + }; + + system.stateVersion = 5; +} diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix new file mode 100644 index 0000000..ded22ec --- /dev/null +++ b/hosts/macbook/home.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs, inputs, ...}: + +{ + imports = [ + ../../modules/home-manager + ]; + + home.username = "schererleander"; + home.homeDirectory = "/Users/schererleander"; + + home.packages = with pkgs; [ + htop + ffmpeg + wget + imagemagick + + gcc + maven + cmake + gnupg + + neovim + + nerd-fonts.symbols-only + ]; + + zsh.enable = true; + tmux.enable = true; + git.enable = true; + + home.stateVersion = "25.05"; +} diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix deleted file mode 100644 index 9cee9a7..0000000 --- a/hosts/nixos/configuration.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ config, pkgs, ... }: - -{ - imports = - [ - ./hardware-configuration.nix - ]; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # Use latest kernel. - boot.kernelPackages = pkgs.linuxPackages_latest; - - networking.hostName = "nixos"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Enable networking - networking.networkmanager.enable = true; - - # Disable wait online - systemd.services.NetworkManager-wait-online.enable = false; - - # Set your time zone. - time.timeZone = "Europe/Berlin"; - - # Select internationalisation properties. - i18n.defaultLocale = "de_DE.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "de_DE.UTF-8"; - LC_IDENTIFICATION = "de_DE.UTF-8"; - LC_MEASUREMENT = "de_DE.UTF-8"; - LC_MONETARY = "de_DE.UTF-8"; - LC_NAME = "de_DE.UTF-8"; - LC_NUMERIC = "de_DE.UTF-8"; - LC_PAPER = "de_DE.UTF-8"; - LC_TELEPHONE = "de_DE.UTF-8"; - LC_TIME = "de_DE.UTF-8"; - }; - - # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; - - # Configure console keymap - console.keyMap = "de"; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # 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; - }; - - users.users.schererleander = { - isNormalUser = true; - description = "schererleander"; - extraGroups = [ "networkmanager" "wheel" "video" "input" ]; - ]; - }; - - programs.firefox.enable = true; - programs.steam.enable = true; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - environment.systemPackages = with pkgs; [ - neovim - git - ]; - - services.openssh.enable = true; - - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - system.stateVersion = "25.05"; - -} diff --git a/hosts/nixos/wooting.nix b/hosts/nixos/wooting.nix deleted file mode 100644 index e6217cd..0000000 --- a/hosts/nixos/wooting.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - options.wooting.enable = lib.mkEnableOption "Enable Wooting udev rules"; - config = lib.mkIf config.wooting.enable { - services.udev.extraRules = '' - # Wooting One Legacy - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", TAG+="uaccess" - - # Wooting One update mode - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess" - - # Wooting Two Legacy - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", TAG+="uaccess" - - # Wooting Two update mode - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", TAG+="uaccess" - - # Generic Wootings - SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="31e3", TAG+="uaccess" - ''; - - environment.systemPackages = with pkgs; [ - wootility - ]; - }; -} \ No newline at end of file -- cgit v1.3.1