Merge branch 'master' into home

Reviewed-on: #42

flake.nix

@@ -19,10 +19,7 @@
     }:
     let
       system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      };
+      pkgs = import nixpkgs { inherit system; };
     in
     {
       homeConfigurations = {

home.nix

@@ -17,10 +17,7 @@
     ./programs/tmux.nix
     ./programs/git.nix
     ./programs/libreoffice.nix
-    ./programs/vscode.nix
     ./programs/nvim.nix
-    ./programs/azuredatastudio.nix
-    ./programs/filezilla.nix
     ./programs/ripgrep.nix
     ./wm/rofi.nix
     ./wm/cursor.nix

programs/azuredatastudio.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = [
-    pkgs.azuredatastudio
-  ];
-}

programs/filezilla.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    filezilla
-  ];
-}

programs/git.nix

@@ -5,7 +5,7 @@
     enable = true;
     settings.user = {
       name = "Armel van Ravels";
-      email = "armel@webavance.nl";
+      email = "armel@armel.nl";
     };
   };
 }

programs/vscode.nix

@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.vscode = {
-    enable = true;
-
-    package = pkgs.vscode.fhs;
-    profiles.default.extensions = with pkgs.vscode-extensions; [
-      ms-dotnettools.csharp
-      ms-dotnettools.csdevkit
-      ms-dotnettools.vscode-dotnet-runtime
-      mkhl.direnv   # Direnv integration for VSCode
-    ];
-
-    profiles.default.userSettings = {
-      "direnv.restart.automatic" = true;
-      "terminal.integrated.defaultProfile.linux" = "zsh";
-      "terminal.integrated.profiles.linux" = {
-        zsh = {
-          path = pkgs.zsh;
-        };
-      };
-    };
-  };
-}

wm/hyprland.nix

@@ -32,8 +32,8 @@
       };
 
       decoration = {
-        inactive_opacity = 0.9;
-        active_opacity = 1.0;
+        inactive_opacity = 0.8;
+        active_opacity = 0.9;
         rounding = 5;
         rounding_power = 2.5;
         blur = {

wm/hyprpaper.nix

@@ -15,7 +15,6 @@ in
       ];
       wallpaper = [
         "DP-2,${wallpaper2}"
-        "HDMI-A-1,${wallpaper2}"
         ",${wallpaper}"
       ];
     };

wm/waybar.nix

@@ -24,7 +24,6 @@
         "pulseaudio"
         "cpu"
         "tray"
-        "battery"
         "clock"
       ];
 
@@ -50,10 +49,6 @@
         ignored-players = [ "firefox" "vlc" ];
       };
 
-      tray = {
-        spacing = 10;
-      };
-
       cpu = {
         format = "  {usage}%";
         tooltip = false;
@@ -67,11 +62,6 @@
         format = "{icon} {name}";
         on-click = "activate";
       };
-
-      battery = {
-        "format" = "{icon}  {capacity}%";
-        "format-icons" = ["" "" "" "" ""];
-      };
     };
   };
 }