build: use flakes for config

nixos/home/bashdots.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.bash = {   # TODO: deal with root dotfiles
@@ -29,8 +29,8 @@
       "cdspell"
       "dirspell"
       "dotglob"
-    ]
-    ;
+    ];
+
     shellAliases = {
       sudo  = "sudo ";
       frick = "sudo $(fc -ln -1)";

nixos/home/dotfiles.nix

@@ -6,21 +6,21 @@ in
 
 {
   xdg.configFile = {
-    "swayosd/style.css".source  = config.lib.file.mkOutOfStoreSymlink "${configDir}/swayosd/style.css";
+    "swayosd/style.css".source     = config.lib.file.mkOutOfStoreSymlink "${configDir}/swayosd/style.css";
 
-    "gtklock/config.ini".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/gtklock/config.ini";
-    "gtklock/style.css".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/gtklock/style.css";
+    "gtklock/config.ini".source    = config.lib.file.mkOutOfStoreSymlink "${configDir}/gtklock/config.ini";
+    "gtklock/style.css".source     = config.lib.file.mkOutOfStoreSymlink "${configDir}/gtklock/style.css";
 
-    "ripgrep".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/ripgrep";
+    "ripgrep".source               = config.lib.file.mkOutOfStoreSymlink "${configDir}/ripgrep";
 
     "discord/settings.json".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/discord/settings.json";
 
-    "dolphinrc".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/dolphinrc";
-    "kdeglobals".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/kdeglobals";
-    "kiorc".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/kiorc";
-    "mimeapps.list".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/mimeapps.list";
-    "neofetch".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/neofetch";
-    "swappy".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/swappy";
+    "dolphinrc".source             = config.lib.file.mkOutOfStoreSymlink "${configDir}/dolphinrc";
+    "kdeglobals".source            = config.lib.file.mkOutOfStoreSymlink "${configDir}/kdeglobals";
+    "kiorc".source                 = config.lib.file.mkOutOfStoreSymlink "${configDir}/kiorc";
+    "mimeapps.list".source         = config.lib.file.mkOutOfStoreSymlink "${configDir}/mimeapps.list";
+    "neofetch".source              = config.lib.file.mkOutOfStoreSymlink "${configDir}/neofetch";
+    "swappy".source                = config.lib.file.mkOutOfStoreSymlink "${configDir}/swappy";
   };
 
   programs = {

nixos/home/hyprland.nix

@@ -1,15 +1,5 @@
-{ pkgs, config, ... }: let
-
+{ pkgs, config, hyprland, hyprgrass, ags, ... }: let
   configDir = "/home/matt/.nix/config";
-
-  flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
-
-  hyprland = (import flake-compat {
-    src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/master.tar.gz";
-  }).defaultNix;
-
-  ags = (builtins.getFlake "github:Aylur/ags");
-
 in
 {
   home.packages = [
@@ -25,15 +15,16 @@ in
 
   programs.ags = {
     enable = true;
+    package = ags.packages.x86_64-linux.default;
     configDir = config.lib.file.mkOutOfStoreSymlink "${configDir}/ags";
   };
 
   wayland.windowManager.hyprland = {
     enable = true;
-    package = (builtins.getFlake "github:horriblename/hyprgrass").inputs.hyprland.packages.x86_64-linux.default;
+    package = hyprland.packages.x86_64-linux.default;
 
     plugins = [
-      "${(builtins.getFlake "github:horriblename/hyprgrass").packages.x86_64-linux.default}/lib/libhyprgrass.so"
+      "${hyprgrass.packages.x86_64-linux.default}/lib/libhyprgrass.so"
     ];
 
     extraConfig = ''

nixos/home/main.nix

@@ -1,14 +1,11 @@
-{ config, pkgs,  ... }:
-let
-  home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-in
+{ home-manager,  ... }:
+
 {
 ## Global config to add home-manager module
 #############################################################################
-  imports =
-    [
-      (import "${home-manager}/nixos")
-    ];
+  imports = [
+    home-manager.nixosModules.default
+  ];
 
   # Define a user account. Don't forget to set a password with 'passwd'.
   users.users.matt = {

nixos/home/packages.nix

@@ -26,7 +26,7 @@
     };
   };
 
-  home.packages = with pkgs; 
+  home.packages = with pkgs;
     (with python311Packages; [
       python
       pyclip
@@ -40,6 +40,12 @@
     (with plasma5Packages; [
       polkit-kde-agent
       qtstyleplugin-kvantum
+      ark
+      kcharselect
+      kdenlive
+      okular
+
+      # Dolphin & co
       dolphin
       dolphin-plugins
       kdegraphics-thumbnailers
@@ -47,11 +53,7 @@
       kio
       kio-admin # needs to be both here and in system pkgs
       kio-extras
-      ark
-      kcharselect
-      kdenlive
       kmime
-      okular
 
     ]) ++
     (with gnome; [
@@ -59,8 +61,8 @@
       seahorse
       adwaita-icon-theme
 
-    ]) ++
-  [
+    ]) ++ [
+
     (writeShellScriptBin "Gparted" ''
       (
         sleep 1.5
@@ -79,9 +81,10 @@
     # School
     virt-manager
     gradle
-    gradle-completion
+    gradle-completion # not working
+    jdk19_headless
     #camunda-modeler
-    #
+
     protonmail-bridge
     thunderbird
     input-emulator
@@ -102,7 +105,6 @@
     qt6.qtwayland
     bottles-unwrapped
     zscroll
-    httrack
     lisgd
     zeal
     acpi
@@ -115,7 +117,6 @@
     xdg-utils
     pavucontrol # TODO: open on left click
     gimp-with-plugins
-    jdk19_headless
     bluez-tools
     vlc
     discord
@@ -149,6 +150,5 @@
     squeekboard
     glib
     appimage-run
-    gparted # doesn't open without sudo
   ];
 }