configuration.nix

@@ -38,12 +38,9 @@ in {
   services.printing.drivers = with pkgs; [
     epson-escpr2
     epson-escpr
-    dcp9020cdwlpr
     ghostscript
     cups-filters
   ];
-  services.mullvad-vpn.enable = true;
-  services.mullvad-vpn.package = pkgs.mullvad-vpn;
 
 
   # Set your time zone.
@@ -65,10 +62,6 @@ in {
   };
 
   programs.hyprland.enable = true;
-  services.xserver.enable = true;
-  # You may need to comment out "services.displayManager.gdm.enable = true;"
-  services.displayManager.sddm.enable = true;
-  services.desktopManager.plasma6.enable = true;
 
   # Configure console keymap
   console.keyMap = "sv-latin1";
@@ -77,7 +70,7 @@ in {
   users.users.svante = {
     isNormalUser = true;
     description = "Svante";
-    extraGroups = [ "networkmanager" "wheel" "audio" "dialout" "wireshark" ];
+    extraGroups = [ "networkmanager" "wheel" "audio" "dialout" ];
     shell = pkgs.zsh;
     packages = with pkgs; [];
   };
@@ -93,13 +86,6 @@ in {
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  services.syncthing = {
-    enable = true;
-    user = "svante";
-    dataDir = "/home/svante/Documents";    # Default folder for new synced folders
-    configDir = "/home/svante/Documents/.config/syncthing";   # Folder for Syncthing's settings and keys
-  };
-
   # virtualisation.docker.enable = true;
   # virtualisation.docker.rootless = {
   #   enable = true;
@@ -124,14 +110,12 @@ in {
   environment.systemPackages = with pkgs; [
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     neovim
-    libsForQt5.lightly
     curl
     gsettings-desktop-schemas
     mlocate
     glib
     links2
     dolphin
-    wireshark
     pkg-config
     gnome.nautilus
     kitty
@@ -149,7 +133,6 @@ in {
     wtype
     cifs-utils
     waybar
-    ffmpeg
     pulsemixer
     waypaper
     swaybg
@@ -314,10 +297,9 @@ in {
     enable = true;
     allowedTCPPortRanges = [ 
       { from = 1714; to = 1764; } # KDE Connect
-      { from = 22000; to = 22000; } # KDE Connect
     ];  
     allowedUDPPortRanges = [ 
-      { from = 22000; to = 22000; } # KDE Connect
+      { from = 1714; to = 1764; } # KDE Connect
     ];  
   };
 

dotfiles/hypr/hyprland.conf

@@ -78,6 +78,11 @@ dwindle {
     preserve_split = yes # you probably want this
 }
 
+master {
+    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+    new_is_master = true
+}
+
 gestures {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
     workspace_swipe = off

dotfiles/nvim/after/lsp.lua

@@ -68,11 +68,3 @@ require('lspconfig').cssls.setup { capabilities = capabilities }
 require('lspconfig').eslint.setup { capabilities = capabilities }
 require('lspconfig').bashls.setup { capabilities = capabilities }
 require('lspconfig').pyright.setup { capabilities = capabilities }
-require('lspconfig').ccls.setup {
-    capabilities = capabilities,
-    init_options = {
-        index = {
-            blacklist = {"opt"}
-        }
-    }
-}

dotfiles/scripts/otp.sh

@@ -1,17 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
-folder="$(ls ~/.password-store/ | sed -e 's/\.gpg$//' | fuzzel -d)"
+folder="$(ls ~/.password-store/ | sed -e 's/\.gpg$//' | ~/.local/bin/dmenu -i)"
 
 if [ -z $folder ];
 then
     exit
 fi
 
-choice="$(ls ~/.password-store/$folder | sed -e 's/\.gpg$//' | fuzzel -d)"
+choice="$(ls ~/.password-store/$folder | sed -e 's/\.gpg$//' | ~/.local/bin/dmenu -i)"
 
 if [ -z $choice ];
 then
     exit
 fi
 
-wtype -d 10 "$(pass otp "$folder/$choice")"
+xdotool type "$(pass otp $folder/$choice)"

dotfiles/zshrc

@@ -15,7 +15,7 @@ compinit
 export TERM="xterm"
 
 # Shorthands
-alias ls='ls --color=yes -h'
+alias ls='ls --color=yes'
 alias l='ls -l'
 alias la='ls -a'
 alias ll='ls -la'

home.nix

@@ -5,65 +5,44 @@
   home.homeDirectory = "/home/svante";
   home.stateVersion = "23.11"; 
 
-  home.packages = with pkgs; [
+  home.packages = [
-    fortune
+    pkgs.fortune
-    mako
+    pkgs.mako
-    kdePackages.kalgebra
+    pkgs.htop
-    libreoffice
+    pkgs.xwaylandvideobridge
-    htop
+    pkgs.pipewire
-    ripgrep
+    pkgs.wireplumber
-    xwaylandvideobridge
+    pkgs.xdg-desktop-portal-hyprland
-    qtpass
+    pkgs.qt6.qtwayland
-    pipewire
+    pkgs.libsForQt5.qt5.qtwayland
-    jdk21
+    pkgs.obs-studio
-    wireplumber
+    pkgs.prismlauncher
-    xdg-desktop-portal-hyprland
+    pkgs.prusa-slicer
-    qt6.qtwayland
+    pkgs.gphoto2
-    libsForQt5.qt5.qtwayland
+    pkgs.freecad
-    ccls
+    pkgs.direnv
-    clang
+    pkgs.easyeffects
-    obs-studio
+    pkgs.tmux
-    prismlauncher
+    pkgs.kicad
-    prusa-slicer
+    pkgs.spotify
-    gphoto2
+    pkgs.arduino-ide
-    freecad
+    pkgs.blender
-    direnv
+    pkgs.gimp
-    easyeffects
+    pkgs.davinci-resolve
-    tmux
+    pkgs.feh
-    kicad
+    pkgs.unityhub
-    spotify
+    pkgs.distrobox
-    arduino-ide
+    pkgs.godot_4
-    blender
+    pkgs.dig
-    gimp
+    pkgs.socat
-    davinci-resolve
+    pkgs.android-studio
-    feh
+    pkgs.android-tools
-    unityhub
+    pkgs.steam
-    distrobox
+    pkgs.sidequest
-    godot_4
+    pkgs.openjdk17
-    dig
+    pkgs.libei
-    socat
-    android-studio
-    android-tools
-    steam
-    sidequest
-    libei
   ];
 
-  programs.ncspot = {
-    enable = true;
-    settings = {
-      notify = true;
-    };
-  };
-
-  services.mako = {
-    enable = true;
-    backgroundColor = "#1e1e2ee0";
-    borderRadius = 10;
-    icons = false;
-    defaultTimeout = 3000;
-  };
-
   home.file = {
 	".config/fuzzel".source = dotfiles/fuzzel;
 	".config/hypr".source = dotfiles/hypr;