Desktop stuff

1 files changed, 41 insertions, 39 deletions

diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 6d7f3d0..78c684a 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, nhekoSrc, mtxclientSrc, ... }:
 
 {
   imports =
@@ -6,6 +6,7 @@
       ../../modules/base-client.nix
       ../../modules/packages/vim.nix
       ../../modules/environments/home.nix
+      ../../modules/software-templates/profilers.nix
     ];
 
     boot = {
@@ -37,6 +38,7 @@
       prefixLength = 24;
     } ];
 
+    defaultGateway = "192.168.0.1";
     # useDHCP = true;
   };
 
@@ -51,7 +53,23 @@
       libinput.enable = true;
       layout = "us";
       #modules = [ pkgs.xorg.xf86videointel ];
+      windowManager.i3.enable = true;
+      windowManager.i3.extraPackages = with pkgs; [
+        dmenu
+        i3status
+        polybarFull
+        dunst
+      ];
+      windowManager.i3.extraSessionCommands = ''
+        xrandr --output DP-5 --auto --pos -1920x1080
+        xrandr --output HDMI-0 --auto --primary --pos 1920x0
+        polybar &
+        dunst &
+      '';
     };
+    picom.enable = true;
+    picom.vSync = false;
+    picom.backend = "glx";
     gnome = {
       core-developer-tools.enable = false;
       core-utilities.enable = false;
@@ -66,6 +84,7 @@
       gnome-initial-setup.enable = false;
       gnome-browser-connector.enable = false;
       games.enable = false;
+      gnome-keyring.enable = lib.mkForce false;
       evolution-data-server.enable = lib.mkForce false;
       at-spi2-core.enable = lib.mkForce false;
     };
@@ -105,60 +124,37 @@
   };
 
   environment.systemPackages = with pkgs; [
-    wget
-    neofetch
-    lnav
-    pciutils
-    git
-    lsd
-    duf
-    htop
-    btop
-    udisks
-    gparted
-    kitty.terminfo
-    glxinfo
-    jq
-    yq
-    pv
-    dig
-    cloud-utils
-    sshfs
     cinnamon.nemo
     firefox-bin
 
-    #epiphany
+    schildichat-desktop
+
     gnome-console
     feh
-    # Various extensions...
-    # - Gnome
-    #gnomeExtensions.vitals
-    #gnomeExtensions.runcat
-    #  - Dont work on gnome 43:
-    #gnomeExtensions.undecorate
-    #gnomeExtensions.inactivity
-    #gnomeExtensions.left-clock
-    # - Vim
-    vimPlugins.vim-nix
-    # - zsh
-    zsh
-    zsh-powerlevel10k
-    zsh-nix-shell
-    zsh-you-should-use
-    zsh-syntax-highlighting
-    zsh-completions
+    easyeffects
+    kitty
+    youtube-music
 
     # - IDEs
     jetbrains-toolbox
+    jetbrains.rider
+    
     dbeaver
     insomnia
+    vscode
+
+    # - Languages
+    #dotnet-sdk_7
+    #dotnet-sdk_8
+    (callPackage ../../modules/packages/dotnet-pack.nix { inherit pkgs; })
 
     #games
     osu-lazer-bin
     #steam
     steam-run
     steam-acf
-    
+
+    (callPackage ../../modules/packages/nheko-git.nix { inherit nhekoSrc; inherit mtxclientSrc; })
   ];
   programs.steam.enable = true;
   programs.steam.gamescopeSession.enable = true;
@@ -223,6 +219,12 @@
     package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
+  environment.etc."resolv.conf".text = ''
+    nameserver 8.8.8.8
+    nameserver 8.4.4.8
+    nameserver 1.1.1.1
+    nameserver 1.0.0.1
+    '';
   
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }