balls

base/callisto/configuration.nix

@@ -16,6 +16,7 @@
   #  undockEvent = "${pkgs.wlr-randr}/bin/wlr-randr --output eDP-1 --pos 0,0";
   #};
   programs.gamemode.enable = true;
+
   virtualisation.kvmgt = {
     enable = true;
     vgpus = {
@@ -25,6 +26,7 @@
     };
   };
   services.gvfs.enable = true;
+  programs.thunderbird.enable = true;
   services.kmonad = {
     enable = true;
     keyboards.thinkpad = {
@@ -136,8 +138,26 @@
   services.fprintd.enable = true;
   services.udisks2.enable = true;
   # Bootloader.
-  boot.loader.systemd-boot.enable = true;
+  boot.loader.systemd-boot.enable = false;
-  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.limine = {
+    enable = true;
+    style.wallpapers = [ ];
+    additionalFiles = {
+      "efi/memtest86/memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi";
+      "efi/shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi";
+
+    };
+    extraEntries = ''
+    /memtest86
+      protocol: efi
+      path: boot():/limine/efi/memtest86/memtest86.efi
+    /shell
+      protocol: efi
+      path: boot():/limine/efi/shell.efi
+    '';
+
+  };
+  boot.loader.efi.canTouchEfiVariables = false;
 
   networking.hostName = "callisto"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
@@ -256,16 +276,19 @@
     s-tui
     stress
     xfsprogs
+    protonvpn-gui
+    memtest86-efi
+    edk2-uefi-shell
   #  wget
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
+  programs.gnupg.agent = {
-  #   enable = true;
+    enable = true;
-  #   enableSSHSupport = true;
+    enableSSHSupport = true;
-  # };
+  };
 
   # List services that you want to enable:
 

base/firewall.nix

@@ -1,5 +1,3 @@
 {
-  networking.firewall.allowedTCPPorts = [ 22000 ];
+  services.syncthing.openDefaultPorts = true;
-  networking.firewall.allowedUDPPorts = [ 22000 21027 ];
-  #for syncthing
 }

base/overrides.nix

@@ -37,7 +37,6 @@
 	 gnome2.GConf
 	 icu
 	 openldap
-	 
        ];
     })
   ];

flake.lock

@@ -40,21 +40,6 @@
       }
     },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -160,25 +145,6 @@
         "type": "github"
       }
     },
-    "nixgl": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1713543440,
-        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
-        "owner": "nix-community",
-        "repo": "nixGL",
-        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixGL",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1744098102,
@@ -195,38 +161,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-test": {
-      "locked": {
-        "lastModified": 1741851582,
-        "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1660551188,
-        "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1744463964,
         "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
@@ -242,7 +177,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1744157173,
         "narHash": "sha256-bWSjxDwq7iVePrhmA7tY2dyMWHuNJo8knkO4y+q4ZkY=",
@@ -261,7 +196,7 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nuschtosSearch": "nuschtosSearch"
       },
       "locked": {
@@ -280,7 +215,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
@@ -307,9 +242,7 @@
         "home-manager": "home-manager",
         "nix-index-database": "nix-index-database",
         "nix-system-graphics": "nix-system-graphics",
-        "nixgl": "nixgl",
+        "nixpkgs": "nixpkgs_2",
-        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-test": "nixpkgs-test",
         "nixvim": "nixvim",
         "system-manager": "system-manager"
       }

flake.nix

@@ -3,8 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-test.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixgl.url = "github:nix-community/nixGL";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     catppuccin.url = "github:catppuccin/nix";
@@ -21,12 +19,11 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-test, home-manager, system-manager, ...}:{
+  outputs = inputs@{ self, nixpkgs, home-manager, system-manager, ...}:{
     nixosConfigurations."apollo" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./base/apollo
+        ./base/apollo	
-	
 	home-manager.nixosModules.home-manager {
 	  #imports = [ inputs.nix-index-database.hmModules.nix-index ];
 	  home-manager.extraSpecialArgs = {
@@ -106,7 +103,7 @@
     };
     #other confs go here, cant be assed rn
     homeConfigurations.generic = home-manager.lib.homeManagerConfiguration {
-      pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [inputs.nixgl.overlay]; };
+      pkgs = import nixpkgs; # { system = "x86_64-linux"; overlays = [inputs.nixgl.overlay]; };
       modules = [ ./home ];
       extraSpecialArgs = { 
         inherit inputs; 

home/default.nix

@@ -3,7 +3,7 @@
     #home-manager modules
     inputs.nix-index-database.hmModules.nix-index
     inputs.nixvim.homeManagerModules.nixvim
-    inputs.catppuccin.homeManagerModules.catppuccin
+    inputs.catppuccin.homeModules.catppuccin
     #aux files to make finding specific things easier
     ./nixvim
     ./sway.nix
@@ -23,19 +23,13 @@
     };
   };
   programs.home-manager.enable = (!vars.isNixOS); #value is set in flake.nix
-  #targets.genericLinux.enable = (!vars.isNixOS);
+
-  
+  programs.foot.enable = true;
-  programs.foot = {
+  programs.foot.settings.main.font = "monospace:size=10";
-    enable = true;
+
-    settings.main.font = "monospace:size=10";
+  programs.ncmpcpp.enable = true;
-    #settings.colors.alpha = "0.8";
+  programs.ncmpcpp.settings.tags_separator = ";";
-  };
+
-  programs.ncmpcpp = {
-    enable = true;
-    settings = {
-      tags_separator = ";";
-    };
-  };
   programs.password-store = {
     enable = true;
     package = pkgs.pass.withExtensions (exts: [exts.pass-otp exts.pass-import]);
@@ -51,16 +45,18 @@
         type "pipewire"
 	name "default pipewire"
       }
+      audio_output {
+        type "alsa"
+	name "alsa"
+      }
     '';
   };
   services.syncthing.enable = (vars.useSyncthing);
-  
+
-  services.mpd-mpris = {
+  services.mpd-mpris.enable = true;
-    enable = true;
+
-  };
+  programs.waybar.enable = true;
-  programs.waybar = {
+
-    enable = true;
-  };
   programs.git = {
     enable = true;
     userName = "beanigen";
@@ -72,17 +68,18 @@
       init.defaultBranch = "main";
     };
   };
+
   xdg.portal = {
     enable = true;
     extraPortals = [ pkgs.xdg-desktop-portal-wlr ];
     configPackages = [ pkgs.xdg-desktop-portal-wlr ];
   };
-  programs.obs-studio = {
+#  programs.obs-studio = {
-    enable = true;
+#    enable = true;
-    plugins = with pkgs.obs-studio-plugins; [
+#    plugins = with pkgs.obs-studio-plugins; [
-      wlrobs
+#      wlrobs
-      obs-backgroundremoval
+#      obs-backgroundremoval
-      obs-pipewire-audio-capture
+#      obs-pipewire-audio-capture
-    ];
+#    ];
-  };
+#  };
 }

home/packages.nix

@@ -1,48 +1,45 @@
 {pkgs, vars, ...}:{
   home.packages = with pkgs; [
-    prismlauncher
-    libgpod
-    vesktop
-    kdePackages.ark
-    v4l-utils
-    nextcloud-client
     blender-hip
+    brightnessctl
     cinny-desktop
-    libimobiledevice
-    mpc
-    strawberry
-#    lmms
-    kanshi
-    emacs
     comma
+    emacs
+    firefox
+    fzf
+    gamescope
+    gimp
+    grim
+    gtklock
+    gzdoom
+    hyfetch
+    inkscape
+    kanshi
+    kdePackages.ark
+    libgpod
+    libimobiledevice
+    libreoffice
+    mpc
+    nemo
+    nextcloud-client
+    openrct2
     openscad
     openutau
-    wlr-randr
-    grim
-    slurp
-    swaynotificationcenter
-    udiskie
-    gtklock
-    swaybg
-    gzdoom
-    fzf
-    openrct2
-    wl-clipboard
-    brightnessctl
-    nemo
-    xfce.ristretto
-    xfce.tumbler
-    inkscape
-    hyfetch
     pamixer
     pavucontrol
-    gimp
-    prusa-slicer
-    gamescope
-    vlc
     playerctl
-    firefox
+    prismlauncher
+    prusa-slicer
+    slurp
+    swaybg
+    swaynotificationcenter
+    udiskie
     v4l-utils
-    libreoffice
+    vesktop
-  ] ++ (if !vars.isNixOS then [nixgl.nixGLIntel] else []);
+    vlc
+    wl-clipboard
+    wlr-randr
+    xfce.ristretto
+    xfce.tumbler
+  ]; #++ (if !vars.isNixOS then [nixgl.nixGLIntel] else []);
 }

home/sway.nix

@@ -1,4 +1,4 @@
-{lib, osConfig, pkgs, vars, inputs, ...}:{
+{lib, pkgs, vars, ...}:{
   wayland.windowManager.sway = {
     package = pkgs.swayfx;
     enable = true;
@@ -58,7 +58,7 @@
       workspaceLayout = "default";
       keybindings = lib.mkOptionDefault {
         "Print" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshots/screenshot-`date +%F-%T`.png";
-        "Mod4+d" = "exec foot --title launch --app-id fzf-launcher-foot bash -c 'compgen -c | sort -u | fzf | xargs swaymsg exec --'";
+        "Mod4+d" = "exec foot --title launch --app-id fzf-launcher-foot bash -c 'compgen -c | sort -u | fzf --bind=enter:replace-query+print-query | xargs swaymsg exec --'";
 	"Mod4+t" = "exec foot --title music --app-id mpd-control-foot ncmpcpp";
         "XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1.0";
         "XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
@@ -73,7 +73,7 @@
         "XF86AudioMedia" = "exec vlc";
         "XF86Launch1" = "exec nmcli device wifi rescan";
         "Shift_L+Control_L+B" = "exec playerctl position 10-";
-        "Shift_L+Control_L+F" = "exec playerctl position 10+";
+        "Shift_L+Control_L+F" = "exec--bind=enter:replace-query+print-query playerctl position 10+";
 	"Mod4+w" = null;
 	"Mod4+s" = null;
 	
@@ -83,22 +83,6 @@
 	{ app_id = "^mpd-control-foot$";}
 	{ con_mark = "DELTARUNE Chapter 1&2";}
       ];
-#  colors = {
-#    focused = import ./swaycolors.nix;
-#    focused = {
-#      border = "#cba6f7";
-#    };
-#    focusedInactive = import ./swaycolors.nix; 
-#    focusedInactive = {
-#      background = "#440c88"; 
-#      indicator = "#440c88";
-#    };
-#    unfocused = import ./swaycolors.nix; 
-#    unfocused = {
-#      background = "#440c88";
-#      indicator = "#440c88";
-#    };
-#  };
       window = {
         titlebar = false;
       };

home/waybar/config

@@ -13,6 +13,7 @@
     "memory": {
     	"format": "  {avail} +   {swapAvail} GiB",
     },
+
     "cava": {
         "method": "pipewire",
         "format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
@@ -25,13 +26,16 @@
 	"noise_reduction": 0.5,
         "sensitivity": 13,
     },
+
     "disk": {
     	"format": "  {free} {path}",
     },
+
     "cpu": {
     	"format": "  {usage}% {max_frequency}GHz",
 	"states": { "highcpu": 85 },
     },
+
     "group/dtray": {
     	"orientation": "inherit",
     	"drawer": {
@@ -40,11 +44,13 @@
 	},
     	"modules": ["custom/arrow", "tray"]
     },
+
     "group/audio": {
         "orientation": "inherit",
         "modules": ["wireplumber", ],
 	"on-click": "pavucontrol",
     },
+
     "group/mpdg": {
       "orientation": "inherit",
       "drawer": {
@@ -54,33 +60,41 @@
       },
       "modules": ["mpd", "custom/playpause", "custom/prev", "custom/next"]
     },
+
     "custom/playpause": {
       "format": "󰐎",
       "on-click": "mpc toggle"
     },
+
     "custom/prev": {
       "format": "󰒮",
       "on-click": "mpc prev"
     },
+
     "custom/next": {
       "format": "󰒭",
       "on-click": "mpc next"
     },
+
     "custom/arrow": {
     	"format": "  ",
 	"tooltip": false
     },
+
     "tray": {
       "spacing": 5
     },
+
     "clock": {
       "format": "{:%I:%M %p}",
     },
+
     "wireplumber": {
       "on-click": "pavucontrol",
       "format": "󰓃 {volume}%",
       "format-muted": "󰓄 {volume}%",
     },
+
     "mpd": {
       "on-click": "mpc toggle",
       "format-disconnected": "MPD seems to be down",
@@ -88,6 +102,7 @@
       "format": "{title} - {album} - {artist}",
       "format-paused": "{title} - {album} - {artist}",
     },
+
     "battery": {
       "bat": "BAT0",
       "interval": 5,
@@ -100,6 +115,7 @@
       "format": "{icon} {capacity}%",
       "tooltip-format": "BAT0, {power}W"
     },
+
     "battery#bat1": {
       "bat": "BAT1",
       "interval": 5,
@@ -112,6 +128,7 @@
       "format": "{icon} {capacity}%",
       "tooltip-format": "BAT1, {power}W"
     },
+
     "battery#bat2": {
       "bat": "BAT2",
       "interval": 5,

home/waybar/style.css

@@ -45,7 +45,7 @@ window#waybar {
 	border-radius: 10px;
 	border: 0.2em solid #cba6f7;
 	background: @surface2;
-	min-height: 0;
+	min-height: 0; 
 	margin: 0.2em;
 }
 #battery.warning {