updated for new home config

4 files changed, 42 insertions, 145 deletions

diff --git a/nixpkgs/.config/nixpkgs/flake.nix b/nixpkgs/.config/nixpkgs/flake.nix
index 099c10d..0a01025 100644
--- a/nixpkgs/.config/nixpkgs/flake.nix
+++ b/nixpkgs/.config/nixpkgs/flake.nix
@@ -15,7 +15,6 @@
         system = "x86_64-linux";
         modules = [
           ./per-user/kdam0-home/configuration.nix
-          nixos-hardware.nixosModules.framework
           home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
@@ -34,7 +33,7 @@
       "kdam0" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages."x86_64-linux";
         modules = [
-          ./per-user/kdam0-work/home.nix
+          ./per-user/kdam0-home/home.nix
         ];
 
         # Optionally use extraSpecialArgs
diff --git a/nixpkgs/.config/nixpkgs/per-user/kdam0-home/configuration.nix b/nixpkgs/.config/nixpkgs/per-user/kdam0-home/configuration.nix
index 44b7627..8fa8c97 100644
--- a/nixpkgs/.config/nixpkgs/per-user/kdam0-home/configuration.nix
+++ b/nixpkgs/.config/nixpkgs/per-user/kdam0-home/configuration.nix
@@ -2,15 +2,15 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [ 
       ./hardware-configuration.nix
-      # Include extra host entries
       ./hosts.nix
     ];
 
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+  # Bootloader.
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sda";
+  boot.loader.grub.useOSProber = true;
 
   networking.hostName = "art-sr"; # Define your hostname.
   networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
@@ -26,6 +26,19 @@
     #useXkbConfig = true; # use xkbOptions in tty.
   };
 
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Enable the KDE Plasma Desktop Environment.
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+
+  # Configure keymap in X11
+  services.xserver = {
+    layout = "us";
+    xkbVariant = "";
+  };
+
   nixpkgs.config.allowUnfree = true;
 
   # Enable CUPS to print documents.
@@ -48,8 +61,10 @@
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.kdam0 = {
     isNormalUser = true;
+    description = "kdam0";
     extraGroups = [ 
       "wheel" 
+      "networkmanager" 
       "video" 
       "audio" 
       "docker"
@@ -67,11 +82,9 @@
     htop
     bmon
     alsa-utils
-    libcamera
     docker-buildx
     docker-compose
     wireguard-tools
-    virt-manager
     cacert
     openssl.dev
     (python3.withPackages (ps: with ps; [
@@ -89,7 +102,6 @@
       setSocketVariable = true;
     };
   };
-  virtualisation.libvirtd.enable = true;
 
   # Copy the NixOS configuration file and link it from the resulting system
   # (/run/current-system/configuration.nix). This is useful in case you
@@ -102,31 +114,21 @@
   # this value at the release version of the first install of this system.
   # 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 = "22.11"; # Did you read the comment?
+  system.stateVersion = "23.05"; # Did you read the comment?
 
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
-  security.polkit.enable = true;
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-  };
   #xdg.portal = {
   #  enable = true;
   #  wlr.enable = true;
   #};
-  #hardware.enableAllFirmware = true;
-
-  hardware.bluetooth.enable = true;
 
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
   services.fwupd.enable = true;
-  services.blueman.enable = true;
   security.pam.services = {
-      swaylock = {};
-      waylock = {};
       login.gnupg.enable = true;
     };
-
   programs.zsh.enable = true;
 }
 
diff --git a/nixpkgs/.config/nixpkgs/per-user/kdam0-home/hardware-configuration.nix b/nixpkgs/.config/nixpkgs/per-user/kdam0-home/hardware-configuration.nix
index b0b9748..24ecc53 100644
--- a/nixpkgs/.config/nixpkgs/per-user/kdam0-home/hardware-configuration.nix
+++ b/nixpkgs/.config/nixpkgs/per-user/kdam0-home/hardware-configuration.nix
@@ -5,38 +5,27 @@
 
 {
   imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/a6261869-4550-462b-8e55-df2473630da4";
+    { device = "/dev/disk/by-uuid/f037f7e0-59e5-43c2-9682-28ccd33a9f38";
       fsType = "ext4";
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/5358-A98A";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/3990180a-8508-4d55-9752-c674b21a48d6"; }
-    ];
+  swapDevices = [ ];
 
   # 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.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s20f0u4.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  # high-resolution display
-  # hardware.video.hidpi.enable = lib.mkDefault true;
 }
diff --git a/nixpkgs/.config/nixpkgs/per-user/kdam0-home/home.nix b/nixpkgs/.config/nixpkgs/per-user/kdam0-home/home.nix
index 16e88a0..43bfa97 100644
--- a/nixpkgs/.config/nixpkgs/per-user/kdam0-home/home.nix
+++ b/nixpkgs/.config/nixpkgs/per-user/kdam0-home/home.nix
@@ -16,7 +16,6 @@
       v = "nvim $@";
       r = "ranger $@";
       gst = "git status";
-      cdwl = "nvim ~/.config/nixpkgs/common/dwl_4/config.h";
       chm = "nvim ~/.config/nixpkgs/per-user/kdam0-home/home.nix";
       clsp = "nvim ~/.config/nixpkgs/common/nvim/plugins/lspconfig.lua";
       cnix = "nvim ~/.config/nixpkgs/per-user/kdam0-home/configuration.nix";
@@ -127,35 +126,11 @@
   };
 
 
-  home.stateVersion = "22.11";
+  home.stateVersion = "23.05";
   home.packages = [
-    # Window environment
-    (pkgs.dwl.override {
-      # trying to supply config.home.homeDirectory here leads to "impure" usage.
-      # so disabling it for now
-      # conf = (builtins.readFile "${config.home.homeDirectory}/.config/dwl/config.h");
-      conf = ../../common/dwl_4/config.h;
-    })
-    pkgs.somebar
-    pkgs.foot
-    pkgs.wofi
-    pkgs.wl-clipboard
-    pkgs.wf-recorder
-    pkgs.grim
-    pkgs.slurp
-    pkgs.polkit
-    pkgs.light
-    pkgs.wbg
-    pkgs.swaylock
-    # Browsers
+    # Web
     pkgs.firefox
     pkgs.brave
-    #pkgs.vivaldi
-    #pkgs.vivaldi-ffmprg-codecs
-    # File Managers
-    pkgs.ranger
-    pkgs.pcmanfm
-    pkgs.gvfs
     # Image Editor
     pkgs.krita
     # Fonts
@@ -163,41 +138,34 @@
     pkgs.hack-font
     pkgs.noto-fonts
     pkgs.noto-fonts-cjk
-    # Notifications
-    pkgs.mako
-    pkgs.libnotify
-    # Image viewer
-    pkgs.imv
-    # Video player
-    pkgs.mpv
-    # Pdf Viewer
-    pkgs.zathura
-    # Power stuff
-    pkgs.acpi
     # Latex stuff
     (pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small xifthen ifmtarg framed paralist titling titlesec libertine letltxmacro; })
     pkgs.texmaker
-    # Other stuff
-    pkgs.entr
     pkgs.gnumake
     pkgs.clang
     pkgs.neofetch
-    pkgs.trash-cli
-    pkgs.nextcloud-client
     pkgs.ripgrep
     pkgs.fd
-    pkgs.stow
     pkgs.unzip
     pkgs.nodejs
     pkgs.cargo
+    # Files
+    pkgs.ranger
+    pkgs.nnn
     # Comms
     pkgs.signal-desktop
-    #pkgs.mattermost-desktop
     pkgs.mutt-wizard
     pkgs.isync
     pkgs.msmtp
     pkgs.pass
     pkgs.neomutt
+    pkgs.nextcloud-client
+    pkgs.thunderbird
+    # Office stuff
+    pkgs.libreoffice-qt
+    pkgs.hunspell
+    pkgs.hunspellDicts.en_CA
+    pkgs.lynx
   ];
 
   fonts.fontconfig.enable = true;
@@ -208,69 +176,8 @@
     enableSshSupport = true;
   };
 
-  systemd.user.services = {
-    nextcloud-sync = {
-      Unit = {
-	      Description = "Auto sync Nextcloud";
-        After = "network-online.target";
-      };
-      Service = {
-	Type = "simple";
-	EnvironmentFile = "${config.home.homeDirectory}/.nextcloud.env";
-	ExecStart = ''
-	  ${pkgs.nextcloud-client}/bin/nextcloudcmd \
-	  -h --non-interactive \
-	  --user "''${NEXTCLOUD_USER}" \
-	  --password "''${NEXTCLOUD_PASSWORD}" \
-	  ''${NEXTCLOUD_DIR} \
-	  ''${NEXTCLOUD_URL}
-	'';
-	TimeoutStopSec = "180";
-        KillMode = "process";
-        KillSignal = "SIGINT";
-      };
-      Install.WantedBy = ["multi-user.target"];
-    };
-    bg-wallpaper = {
-      Unit = {
-        Description = "Auto refresh wallpaper";
-        After = "network-online.target";
-      };
-      Service = {
-	      Type = "simple";
-              ExecStart = "${config.home.homeDirectory}/.config/nixpkgs/common/scripts/walp";
-	      TimeoutStopSec = "10";
-        KillMode = "process";
-        KillSignal = "SIGKILL";
-      };
-      Install.WantedBy = ["multi-user.target"];
-    };
-  };
-
-  systemd.user.timers = {
-    nextcloud-sync = {
-      Unit.Description = "Automatic sync files with Nextcloud when booted up after 5 minutes then rerun every 10 minutes";
-      Timer.OnUnitActiveSec = "10min";
-      Install.WantedBy = ["multi-user.target" "timers.target"];
-    };
-  };
-  systemd.user.timers = {
-    bg-wallpaper = {
-      Unit.Description = "Automatic update of wallpaper";
-      Timer.OnUnitActiveSec = "10min";
-      Install.WantedBy = ["multi-user.target" "timers.target"];
-    };
-  };
   systemd.user.startServices = true;
 
   # Source app specific configs
-  home.file.".config/foot/foot.ini".source = ../../common/foot/foot.ini;
-  home.file.".config/wofi/style.css".source = ../../common/wofi/style.css;
-  home.file.".config/mako/config".source = ../../common/mako/config;
   home.file.".local/share/fonts".source = ../../common/fonts;
-
-  #home.file.".config/foot/foot.ini".text = ''
-  #[colors]
-  #alpha=0.
-  #'';
 }