build: use flakes for config

2023-09-29 23:46:34 -04:00 · 2023-09-29 23:46:34 -04:00 · 045287e682
commit 045287e682
parent 0fb2341372
21 changed files with 84 additions and 110 deletions
--- a/README.md
+++ b/README.md
@ -3,12 +3,9 @@
 what is currently not working:

 - plymouth theme has no login prompt
- sddm theme flashes white
- autosign in to keyring

 what i want to do:

- learn flakes
 - add auto-rotate widget in ags control center
 - when multiple widgets open, clicking on a background one puts it forward

--- a/nixos/cfg/boot.nix
+++ b/nixos/cfg/boot.nix
@ -4,11 +4,15 @@
  boot = {
    kernelPackages = pkgs.linuxPackages_latest;
    consoleLogLevel = 0;
-    initrd.verbose = false;
-    initrd.systemd.enable = true;
+
+    initrd = {
+      verbose = false;
+      systemd.enable = true;
+    };

    loader = {
      efi.canTouchEfiVariables = true;
+      timeout = 2;
      grub = {
        enable = true;
        device = "nodev";
@ -19,15 +23,12 @@
        # Because it still draws that image otherwise
        splashImage = null;
      };
-      timeout = 2;
    };

    extraModulePackages = with config.boot.kernelPackages; [
      v4l2loopback
    ];

-    kernelModules = [ "kvm-amd" ];
-
    kernelParams = [
      "quiet"
      "splash"
--- a/nixos/cfg/extra-hardware.nix
+++ b/nixos/cfg/extra-hardware.nix
@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:

 {
  hardware.bluetooth = {
@ -12,17 +12,19 @@
  services = {

    udev.extraRules = ''
-    # give permanent path to keyboard XF86* binds
-    SUBSYSTEMS=="input", ATTRS{id/product}=="0006", ATTRS{id/vendor}=="0000", SYMLINK += "video-bus"
-  '';
+      # give permanent path to keyboard XF86* binds
+      SUBSYSTEMS=="input", ATTRS{id/product}=="0006", ATTRS{id/vendor}=="0000", SYMLINK += "video-bus"
+    '';

    fwupd.enable = true;

    # Enable CUPS to print documents.
-    printing.enable = true;
-    printing.drivers = with pkgs; [
-      hplip
-    ];
+    printing = {
+      enable = true;
+      drivers = with pkgs; [
+        hplip
+      ];
+    };

    pipewire = {
      enable = true;
--- a/nixos/cfg/main.nix
+++ b/nixos/cfg/main.nix
@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:

 {
  imports = [
@ -6,5 +6,5 @@
    ./extra-hardware.nix
    ./security.nix
    ./packages.nix
-  ]; 
+  ];
 }
--- a/nixos/cfg/packages.nix
+++ b/nixos/cfg/packages.nix
@ -1,4 +1,4 @@
-{config, pkgs, lib, ...}:
+{ pkgs, hyprland, ... }:

 {
  systemd.user.services.protonmail-bridge = {
@ -30,10 +30,10 @@
          };
        };
        sessionPackages = [
-          (builtins.getFlake "github:hyprwm/Hyprland").packages.x86_64-linux.default
+          hyprland.packages.x86_64-linux.default
        ];
        defaultSession = "hyprland";
-        autoLogin = { # logs out after a minute
+        autoLogin = {
          enable = true;
          user = "matt";
        };
--- a/nixos/cfg/security.nix
+++ b/nixos/cfg/security.nix
@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, lib, ... }:

 {
  services.fprintd.enable = true;
@ -11,7 +11,7 @@

  services.logind.lidSwitch = "lock";
  services.gnome.gnome-keyring.enable = true;
-  
+
  # Open ports in the firewall.
  # networking.firewall.allowedTCPPorts = [ ... ];
  # networking.firewall.allowedUDPPorts = [ ... ];
@ -23,7 +23,7 @@
  '';

  security.pam.services = {
-    
+
    gtklock = {};

    # all the changes in /etc/pam.d/*
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@ -1,13 +1,12 @@
 { config, pkgs, ... }:

 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ./overlays/list.nix
-      ./cfg/main.nix
-      ./home/main.nix
-    ];
+  imports = [
+    ./hardware-configuration.nix
+    ./overlays/list.nix
+    ./cfg/main.nix
+    ./home/main.nix
+  ];

  networking = {
    hostName = "wim";
@ -25,20 +24,17 @@
    keyMap = "ca";
    #useXkbConfig = true; # use xkbOptions in tty.
  };
-  
+
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
  nixpkgs.config.allowUnfree = true;

-
  environment.sessionVariables = {
    NIXPKGS_ALLOW_UNFREE = "1";
    GTK_THEME 		 = "Dracula";
    QT_QPA_PLATFORMTHEME = "qt5ct";
    QT_FONT_DPI		 = "125";
  };
-  
-  system.autoUpgrade.channel = "https://nixos.org/channels/nixos-unstable";
-  
+
  # This value determines the NixOS release from which the default
  # settings for stateful data, like file locations and database versions
  # on your system were taken. It's perfectly fine and recommended to leave
@ -46,5 +42,4 @@
  # Before changing this value read the documentation for this option
  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
  system.stateVersion = "23.05"; # Did you read the comment?
-
 }
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
--- a/nixos/hardware-configuration.nix
+++ b/nixos/hardware-configuration.nix
@ -1,29 +1,27 @@
 # 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, ... }:
+{ config, lib, modulesPath, ... }:

 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-amd" ];
  boot.extraModulePackages = [ ];

-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/6ae4d722-dacf-485a-8d29-b276f540dc91";
-      fsType = "btrfs";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/6ae4d722-dacf-485a-8d29-b276f540dc91";
+    fsType = "btrfs";
+  };

  boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/ab82b477-2477-453f-b95f-28e5553ad10d";

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/F6E1-006D";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/F6E1-006D";
+    fsType = "vfat";
+  };

  swapDevices = [ ];

--- a/nixos/home/bashdots.nix
+++ b/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)";
--- a/nixos/home/dotfiles.nix
+++ b/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 = {
--- a/nixos/home/hyprland.nix
+++ b/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 = ''
--- a/nixos/home/main.nix
+++ b/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 = {
--- a/nixos/home/packages.nix
+++ b/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
  ];
 }
--- a/nixos/overlays/list.nix
+++ b/nixos/overlays/list.nix
@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ neovim-nightly-overlay, ... }:

 {
  nixpkgs.overlays = [
@ -25,8 +25,6 @@
      coloryou = final.callPackage ./pkgs/coloryou/default.nix {};
    })

-    (import (builtins.fetchTarball {
-      url = "https://github.com/nix-community/neovim-nightly-overlay/archive/master.tar.gz";
-    }))
+    neovim-nightly-overlay.overlay
  ];
 }
--- a/nixos/overlays/pkgs/dracula-plymouth.nix
+++ b/nixos/overlays/pkgs/dracula-plymouth.nix
@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, pkgs
 }:

 stdenv.mkDerivation {
--- a/nixos/overlays/pkgs/input-emulator.nix
+++ b/nixos/overlays/pkgs/input-emulator.nix
@ -1,5 +1,4 @@
-{ lib
-, stdenv
+{ stdenv
 , meson
 , ninja
 , pkg-config
--- a/nixos/overlays/pkgs/lavanda-sddm.nix
+++ b/nixos/overlays/pkgs/lavanda-sddm.nix
@ -1,8 +1,6 @@
 ### test package
-{ lib
-, stdenv
+{ stdenv
 , fetchFromGitHub
-, pkgs
 }:

 stdenv.mkDerivation {
--- a/nixos/overlays/pkgs/pam-fprint-grosshack.nix
+++ b/nixos/overlays/pkgs/pam-fprint-grosshack.nix
@ -1,5 +1,4 @@
-{ lib
-, stdenv
+{ stdenv
 , meson
 , ninja
 , pkg-config
@ -36,7 +35,7 @@ stdenv.mkDerivation rec {
    pam
    libpam-wrapper
  ];
-  
+
  mesonFlags = [
    "-Dpam_modules_dir=${placeholder "out"}/lib/security"
    "-Dsysconfdir=${placeholder "out"}/etc"
--- a/nixos/overlays/swayosd.nix
+++ b/nixos/overlays/swayosd.nix
@ -1,13 +1,13 @@
 final: prev: {
  swayosd = prev.swayosd.overrideAttrs (oldAttrs: rec {
-    
+
    src = prev.fetchFromGitHub {
      owner = "ErikReider";
      repo = "SwayOSD";
      rev = "8159c9e9962ce19f6fb78201d4d34e5817f53b45";
      hash = "sha256-kGd4/eQkhvxEL3/LToBDjE/JIR8m6w9vdFUrRTyylCE=";
    };
-    
+
    cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const {
      name = "swayosd-vendor.tar.gz";
      inherit src;