Merge

config/base.nix

@@ -21,6 +21,7 @@
   nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
   nix.nixPath = ["/etc/nix/path"];
   users.defaultUserShell = pkgs.bash;
+  documentation.man.generateCaches = false;
   # environment.systemPackages = with pkgs; [
   # ];
   systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
@@ -57,6 +58,11 @@
     bluetooth = {
       enable = true;
       powerOnBoot = true;
+	  settings = {
+	  	General = {
+			Disable="Headset";
+		};
+	  };
     };
   };
 
@@ -96,6 +102,9 @@
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
+  # boot.extraModulePackages = [
+  # 	config.boot.kernelPackages.wireguard
+  # ];
   console.keyMap = "sv-latin1";
 
 	# systemd.services.vdirsyncer = {
@@ -116,7 +125,15 @@
 	#   };
 	# };
 
-	environment.systemPackages = with pkgs; [(
+	environment.systemPackages = with pkgs; [
+		# wireguard-go
+		pulsemixer
+		openssh
+		pinentry-curses
+		spotify-qt
+		wireguard-tools
+		(firefox.override { nativeMessagingHosts = [passff-host]; })
+		(
 		catppuccin-sddm.override {
 			flavor = "mocha";
 			font  = "FiraCode Nerd Font Bold";
@@ -124,7 +141,8 @@
 			background = "${../wallpapers/inverted.png}";
 			loginBackground = true;
 		}
-	)];
+		)
+	];
 
 
   services = {
@@ -134,6 +152,7 @@
 			via
 		];
 	};
+	picom.enable = true;
     openssh = {
       enable = true;
     };

config/home.nix

@@ -22,16 +22,19 @@
     ../shared/firefox.nix
     ../shared/zathura.nix
     ../shared/lazygit.nix
-    ../shared/spotifyd.nix
+    # ../shared/spotifyd.nix
     ../shared/ssh.nix
     ../shared/aerc.nix
     ../shared/rbw.nix
     ../shared/oh-my-posh.nix
+    ../shared/mpv.nix
   ];
 
   nixpkgs = {
     overlays = [];
     config = {
+      # allowUnfree = false;
+      # allowUnfreePredicate = _: false;
       allowUnfree = true;
       allowUnfreePredicate = _: true;
       permittedInsecurePackages = [
@@ -50,7 +53,6 @@
     alsa-utils
     killall
     upower
-    mpv
     gcc
     gnumake
     htop
@@ -71,7 +73,6 @@
     pavucontrol
 	fd
 	bat
-	steam-run
 	appimage-run
 	bluez
 	bluez-tools
@@ -85,33 +86,21 @@
 	go
 	ghorg
 	libsixel
-	kompose
+	valgrind
+	soulseekqt
 
 	#Terminal	
-	weechat
-	jira-cli-go
 	jq
 
-	vscode
-
-	sc-im
 	gnuplot
-	bison
-	tesseract
 	qrencode
-	texliveMedium
+	texliveFull
 
-	vdirsyncer
-	todoist
-	todoman
-	calcure
 	python311Packages.urwid
-	signal-cli
-	scli
+	python311Packages.numpy
+	python311Packages.matplotlib
 	sysz
 	betterlockscreen
-	pyradio
-	haskellPackages.patat
 	gh
     git
     tmux
@@ -119,7 +108,6 @@
     yt-dlp
 	fzf
 	ripgrep
-	fw-pkgs.spotify-player
 	alsa-lib
 	libdbusmenu
 	xorg.libxcb
@@ -132,42 +120,39 @@
 	rustup
 	openssl
 	pkg-config
-	azure-cli
-	azuredatastudio
-	adrs
-	opentofu
 	lazydocker
 
+	#Unfree
+    # obsidian
+    # discord
+    # slack
+
+	#Alternatives
+	slack-cli
+	spotify
+	unstable.spotifyd
+	librespot
+	discordo
+
 	#Desktop
-	openvpn3
+	libreoffice-qt6-fresh
+	fluent-reader
 	aerc
     firefox
-	chromium
 	vial
     thunderbird
-    spotify
-    signal-desktop
-    darktable
-    discord
-	discordo
-    slack
+    signal-desktop-beta
     kitty
 	alacritty
-    neovim
+    unstable.neovim
     fastfetch
-    obsidian
     lazygit
-	betterdiscordctl
 	pdfarranger
 	byzanz
 	drawio
 	xdotool
 	pinentry
     remmina
-	rofi
-	rbw
-	rofi-rbw
-	teams-for-linux
 
 	#Dev
     python3
@@ -175,6 +160,8 @@
 	ranger
 	python311Packages.pynvim
 	ueberzugpp
+	jdk
+	maven
 
 	#LSP
     nil

config/users.nix

@@ -18,6 +18,7 @@
           "wheel"
           "audio" 
           "docker"
+		  "input"
         ];
 		openssh.authorizedKeys = {
 			keys = [