From 5c638473ca343a1408139a70f19d3a725dbe79f2 Mon Sep 17 00:00:00 2001 From: Jade Date: Mon, 22 May 2023 19:01:27 +0200 Subject: [PATCH] gay --- haskell/xmonad/xmonad.hs | 9 +- hosts/potatobook-g/configuration.nix | 132 ++++++++------------------- 2 files changed, 44 insertions(+), 97 deletions(-) diff --git a/haskell/xmonad/xmonad.hs b/haskell/xmonad/xmonad.hs index b313eb0..388ebe6 100644 --- a/haskell/xmonad/xmonad.hs +++ b/haskell/xmonad/xmonad.hs @@ -87,7 +87,11 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ , ((modm, xK_t), spawn "ocr-screenshot.sh") -- Reset the layouts on the current workspace to default - , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf) + -- , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf) + -- , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf) + -- Push window back into tiling + , ((modm .|. shiftMask, xK_space ), withFocused $ windows . W.sink) + -- Resize viewed windows to the correct size , ((modm, xK_n ), refresh) @@ -107,9 +111,6 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ , ((modm, xK_h ), sendMessage Shrink) , ((modm, xK_l ), sendMessage Expand) - -- Push window back into tiling - --, ((modm, xK_t ), withFocused $ windows . W.sink) - -- Increment the number of windows in the master area , ((modm , xK_comma ), sendMessage (IncMasterN 1)) , ((modm , xK_period), sendMessage (IncMasterN (-1))) diff --git a/hosts/potatobook-g/configuration.nix b/hosts/potatobook-g/configuration.nix index 034e487..cd057e7 100644 --- a/hosts/potatobook-g/configuration.nix +++ b/hosts/potatobook-g/configuration.nix @@ -1,5 +1,5 @@ -{ inputs, config, pkgs, lib, ... }: -{ +{ pkgs, ... }: +{ nix.settings = { trusted-substituters = [ "https://t2linux.cachix.org" @@ -17,17 +17,6 @@ #inputs.mms.module ]; - # boot.supportedFilesystems = pkgs.lib.mkForce [ "ext4" "btrfs" "squashfs" ]; - # networking.wireless.enable = pkgs.lib.mkForce false; - - # services.xserver.displayManager.autoLogin.user = pkgs.lib.mkForce "jade"; - # users.users.jade = pkgs.lib.mkForce { - # isNormalUser = true; - # extraGroups = [ "wheel" "input" "uinput" "libvirtd" ]; - # packages = with pkgs; [ - # ]; - # }; - #nixpkgs = { #overlays = [ #(self: super: { @@ -67,8 +56,8 @@ mail.enable = true; }; helix.enable = true; + zellij.enable = true; terminal.enable = true; - neovim.enable = true; zsh.enable = true; }; @@ -108,12 +97,6 @@ }; }; - # environment.variables = { - # GDK_SCALE = "2"; - # GDK_DPI_SCALE = "0.5"; - # _JAVA_OPTIONS = "-Dsun.java2d.uiScale=2"; - # }; - hardware.keyboard.uhk.enable = true; hardware.enableRedistributableFirmware = true; @@ -134,42 +117,44 @@ programs.seahorse.enable = true; security.pam.services.jade.enableGnomeKeyring = true; - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # networking.firewall.allowedTCPPorts = [ 4713 ]; systemd.services."NetworkManager-wait-online".enable = false; - #services.modded-minecraft-servers = { - # This is mandatory, sorry. - #eula = true; + services.pixiecore = + let + nixpkgs = builtins.getFlake "nixpkgs/nixos-unstable"; + sys = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ({config, pkgs, lib, modulesPath, ...}: { + imports = [ + (modulesPath + "/installer/netboot/netboot-base.nix") + ]; - # The name will be used for the state folder and system user. - # In this case, the folder is `/var/lib/mc-e2es` - # and the user `mc-e2es`. - #instances = { - #e2es = { - #enable = true; - #jvmMaxAllocation = "7G"; - #jvmInitialAllocation = "2G"; - #rsyncSSHKeys = [ "" ]; - #serverConfig = { - ## Port must be unique - #white-list = true; - #spawn-protection = 0; - #max-tick-time = 5 * 60 * 1000; - #allow-flight = true; - #server-port = 8080; - #motd = "Hello world"; - #}; - #}; - #}; - #}; + services.getty.autologinUser = lib.mkForce "root"; + console.keyMap = "de"; - # i rly should put that important big comment back here - system.stateVersion = "22.11"; # Did you read the comment? + system.stateVersion = config.system.nixos.release; + environment.systemPackages = with pkgs; [ + helix nil git neofetch + ]; + + programs = { + zsh = { + enable = true; + enableCompletion = true; + }; + }; + }) + ]; + }; + build = sys.config.system.build; + in { + enable = true; + openFirewall = true; + kernel = "${build.kernel}/bzImage"; + initrd = "${build.netbootRamdisk}/initrd"; + cmdLine = "init=${build.toplevel}/init loglevel=4"; + }; systemd.services = { create-swapfile = { @@ -192,47 +177,8 @@ RuntimeDirectorySize=12G ''; - #networking = { - #nameservers = [ - #"192.168.8.205" - #]; - #wireguard = { - #enable = true; - #interfaces = { - #wg-maxim-vpn = { - #privateKey = "CLcq8sCnusXz0jFHz6ODAZBD2Sn2vb9a5BCfbQGrrXk="; - #listenPort = 21124; - #ips = [ - #"10.0.0.4/32" - #]; - #peers = [ - #{ - #allowedIPs = [ - #"10.0.0.0/24" - #"192.168.8.0/24" - #"0.0.0.0/0" - #"::/0" - #]; - #endpoint = "vpn.local.germannr4.com:51820"; - #persistentKeepalive = 25; - #publicKey = "coP4Hh1smQvVI52ftZFyPfmzvsKZcT/hHa8zHMrlZwE="; - #} - #]; - #}; - #}; - #}; - #}; - - #fileSystems."/swap" = { - # device = "/dev/disk/by-uuid/f6d243ec-6be9-4551-8cbb-aefb7b691a62"; - # fsType = "btrfs"; - # options = [ "subvol=swap" "noatime" ]; - #}; - #systemd.services.nix-daemon.environment.NIX_SSHOPTS = let - #knownHosts = pkgs.writeText "known-hosts" '' - #${builtins.readFile ../secret-data/ssh-desktop-knownhosts-thingies} - #''; - #in builtins.trace "-oIdentityFile=/home/jade/.ssh/id_rsa -oUserKnownHostsFile=${knownHosts}" "-v -oIdentityFile=/home/jade/.ssh/id_rsa -oUserKnownHostsFile=/home/jade/nix-configs/secret-data/ssh-desktop-knownhosts-thingies"; + # i rly should put that important big comment back here + system.stateVersion = "22.11"; # Did you read the comment? }