From e68b978c77284c18aed20042ee7122af53567d8f Mon Sep 17 00:00:00 2001 From: "Frankie B." Date: Sun, 25 Aug 2024 01:06:21 +0100 Subject: fuck --- homes/floppydisk/hyprland.nix | 4 - homes/floppydisk/packages.nix | 1 - hosts/banana/configuration.nix | 188 ------------------------------- hosts/banana/hardware-configuration.nix | 34 ------ hosts/default.nix | 4 +- hosts/sunfish/configuration.nix | 184 ++++++++++++++++++++++++++++++ hosts/sunfish/hardware-configuration.nix | 45 ++++++++ 7 files changed, 231 insertions(+), 229 deletions(-) delete mode 100644 hosts/banana/configuration.nix delete mode 100644 hosts/banana/hardware-configuration.nix create mode 100644 hosts/sunfish/configuration.nix create mode 100644 hosts/sunfish/hardware-configuration.nix diff --git a/homes/floppydisk/hyprland.nix b/homes/floppydisk/hyprland.nix index 86f928f..382f57a 100644 --- a/homes/floppydisk/hyprland.nix +++ b/homes/floppydisk/hyprland.nix @@ -69,10 +69,6 @@ preserve_split = "yes"; }; - master = { - new_is_master = true; - }; - gestures = { workspace_swipe = false; }; diff --git a/homes/floppydisk/packages.nix b/homes/floppydisk/packages.nix index a54ac6b..0f64191 100644 --- a/homes/floppydisk/packages.nix +++ b/homes/floppydisk/packages.nix @@ -56,7 +56,6 @@ # devtools github-desktop gh - codeql vscode jetbrains.ruby-mine jetbrains.rider diff --git a/hosts/banana/configuration.nix b/hosts/banana/configuration.nix deleted file mode 100644 index 025bbab..0000000 --- a/hosts/banana/configuration.nix +++ /dev/null @@ -1,188 +0,0 @@ -# This is your system's configuration file. -# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) -{ - inputs, - lib, - config, - pkgs, - ... -}: { - # You can import other NixOS modules here - imports = [ - ./hardware-configuration.nix - ]; - - services.xserver = { - enable = true; - xkb.layout = "us"; - }; - - services.libinput.enable = true; - - - services.tailscale.enable = true; - - hardware.graphics = { - enable = true; - enable32Bit = true; - }; - - nixpkgs = { - # Configure your nixpkgs instance - config = { - # Disable if you don't want unfree packages - allowUnfree = true; - }; - }; - - nix = { - # This will add each flake input as a registry - # To make nix3 commands consistent with your flake - registry = lib.mapAttrs (_: value: {flake = value;}) inputs; - - # This will additionally add your inputs to the system's legacy channels - # Making legacy nix commands consistent as well, awesome! - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; - - settings = { - # Enable flakes and new 'nix' command - experimental-features = "nix-command flakes"; - # Deduplicate and optimize nix store - auto-optimise-store = true; - }; - }; - - # the configuration (pain) - programs = { - gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - hyprland = { - enable = true; - xwayland.enable = true; - }; - zsh.enable = true; - }; - - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - environment.systemPackages = with pkgs; [ - gcc - git - grim - lxqt.lxqt-policykit - pavucontrol - pciutils - pulseaudio - screen - slurp - usbutils - wget - wl-clipboard - xdg-utils - swaynotificationcenter - swayidle - wofi - swaylock - gnome.gnome-keyring - gtklock - tailscale - ]; - - services.printing.enable = true; - - fonts.packages = with pkgs; [ - font-awesome - nerdfonts - jetbrains-mono - winePackages.fonts - ]; - - networking.hostName = "banana"; - networking.networkmanager.enable = true; - - boot.loader.grub.enable = true; - boot.loader.grub.device = "nodev"; - boot.loader.grub.efiSupport = false; - - #boot.loader.systemd-boot.enable = true; - #boot.loader.efi.canTouchEfiVariables = true; - boot.initrd.systemd.enable = true; - boot.kernelPackages = pkgs.linuxPackages_latest; - - # Set a time zone, idiot - time.timeZone = "Europe/London"; - - # Fun internationalisation stuffs (AAAAAAAA) - i18n.defaultLocale = "en_GB.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_GB.UTF-8"; - LC_IDENTIFICATION = "en_GB.UTF-8"; - LC_MEASUREMENT = "en_GB.UTF-8"; - LC_MONETARY = "en_GB.UTF-8"; - LC_NAME = "en_GB.UTF-8"; - LC_NUMERIC = "en_GB.UTF-8"; - LC_PAPER = "en_GB.UTF-8"; - LC_TELEPHONE = "en_GB.UTF-8"; - LC_TIME = "en_GB.UTF-8"; - }; - - # define user acc - users.users.floppydisk = { - isNormalUser = true; - description = "Frankie B."; - extraGroups = ["networkmanager" "wheel"]; - openssh.authorizedKeys.keys = [ - # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect - ]; - shell = pkgs.zsh; - }; - - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; - - # This setups a SSH server. Very important if you're setting up a headless system. - # Feel free to remove if you don't need it. - - services.openssh.enable = true; - - services.greetd = { - enable = true; - restart = true; - settings = { - default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; - user = "greeter"; - }; - }; - }; - - systemd.services.greetd.serviceConfig = { - Type = "idle"; - StandardInput = "tty"; - StandardOutput = "tty"; - StandardError = "journal"; - TTYReset = "true"; - TTYHangup = "true"; - TTYVTDisallocate = true; - }; - - systemd.services.NetworkManager-wait-online.enable = lib.mkForce false; - - security.pam.services.gtklock.text = lib.readFile "${pkgs.gtklock}/etc/pam.d/gtklock"; - - networking.firewall.enable = false; - - system.stateVersion = "24.05"; -} diff --git a/hosts/banana/hardware-configuration.nix b/hosts/banana/hardware-configuration.nix deleted file mode 100644 index 432e7bf..0000000 --- a/hosts/banana/hardware-configuration.nix +++ /dev/null @@ -1,34 +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 = [ "ahci" "ohci_pci" "ehci_pci" "xhci_pci" "pata_jmicron" "aic7xxx" "firewire_ohci" "usb_storage" "usbhid" "floppy" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/805a68e8-b1d8-40b3-a264-58a90044b610"; - fsType = "ext4"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/5190c160-67ec-45b2-bded-b7e6f858cb76"; } - ]; - - # 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..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/default.nix b/hosts/default.nix index f4393d2..411999a 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -31,10 +31,10 @@ in { ]; }; - "banana" = mkSystem { + "sunfish" = mkSystem { specialArgs = commonArgs; modules = [ - ./banana/configuration.nix + ./sunfish/configuration.nix home-manager home ]; diff --git a/hosts/sunfish/configuration.nix b/hosts/sunfish/configuration.nix new file mode 100644 index 0000000..832a80a --- /dev/null +++ b/hosts/sunfish/configuration.nix @@ -0,0 +1,184 @@ +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) +{ + inputs, + lib, + config, + pkgs, + ... +}: { + # You can import other NixOS modules here + imports = [ + ./hardware-configuration.nix + ]; + + services.xserver = { + enable = true; + xkb.layout = "us"; + }; + + services.libinput.enable = true; + + + services.tailscale.enable = true; + + hardware.graphics = { + enable = true; + enable32Bit = true; + }; + + nixpkgs = { + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; + }; + + nix = { + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + # the configuration (pain) + programs = { + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + hyprland = { + enable = true; + xwayland.enable = true; + }; + zsh.enable = true; + }; + + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + environment.systemPackages = with pkgs; [ + gcc + git + grim + lxqt.lxqt-policykit + pavucontrol + pciutils + pulseaudio + screen + slurp + usbutils + wget + wl-clipboard + xdg-utils + swaynotificationcenter + swayidle + wofi + swaylock + gnome-keyring + gtklock + tailscale + ]; + + services.printing.enable = true; + + fonts.packages = with pkgs; [ + font-awesome + nerdfonts + jetbrains-mono + winePackages.fonts + ]; + + networking.hostName = "sunfish"; + networking.networkmanager.enable = true; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.initrd.systemd.enable = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + + # Set a time zone, idiot + time.timeZone = "Europe/London"; + + # Fun internationalisation stuffs (AAAAAAAA) + i18n.defaultLocale = "en_GB.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_GB.UTF-8"; + LC_IDENTIFICATION = "en_GB.UTF-8"; + LC_MEASUREMENT = "en_GB.UTF-8"; + LC_MONETARY = "en_GB.UTF-8"; + LC_NAME = "en_GB.UTF-8"; + LC_NUMERIC = "en_GB.UTF-8"; + LC_PAPER = "en_GB.UTF-8"; + LC_TELEPHONE = "en_GB.UTF-8"; + LC_TIME = "en_GB.UTF-8"; + }; + + # define user acc + users.users.floppydisk = { + isNormalUser = true; + description = "Frankie B."; + extraGroups = ["networkmanager" "wheel"]; + openssh.authorizedKeys.keys = [ + # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect + ]; + shell = pkgs.zsh; + }; + + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + + # This setups a SSH server. Very important if you're setting up a headless system. + # Feel free to remove if you don't need it. + + services.openssh.enable = true; + + services.greetd = { + enable = true; + restart = true; + settings = { + default_session = { + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; + user = "greeter"; + }; + }; + }; + + systemd.services.greetd.serviceConfig = { + Type = "idle"; + StandardInput = "tty"; + StandardOutput = "tty"; + StandardError = "journal"; + TTYReset = "true"; + TTYHangup = "true"; + TTYVTDisallocate = true; + }; + + systemd.services.NetworkManager-wait-online.enable = lib.mkForce false; + + security.pam.services.gtklock.text = lib.readFile "${pkgs.gtklock}/etc/pam.d/gtklock"; + + networking.firewall.enable = false; + + system.stateVersion = "24.05"; +} diff --git a/hosts/sunfish/hardware-configuration.nix b/hosts/sunfish/hardware-configuration.nix new file mode 100644 index 0000000..82ab936 --- /dev/null +++ b/hosts/sunfish/hardware-configuration.nix @@ -0,0 +1,45 @@ +# 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" "usbhid" "usb_storage" "sd_mod" "sr_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/8050c8ec-0625-498d-99f6-198d58f65c79"; + fsType = "ext4"; + }; + + fileSystems."/efi" = { + device = "/dev/disk/by-uuid/4EAD-75BA"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; + + swapDevices = [ + {device = "/dev/disk/by-uuid/1a21fac9-5a8e-4ae1-ae44-5049211d56fc";} + ]; + + # 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..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} -- cgit v1.2.3-54-g00ecf