V0.2 (#2)

Wittionary · web-flow · commit d66c61a552ea · 2024-05-19T21:51:50.000-05:00
* Fixed 1password, added fixed git cred mgr * Added shebangs back * Added dmenu; added vscode extensions * Added = * It says it expected ';'... * Ohhh, I needed a ';' on the line above * Adding = back... * Correcting a typo from VScode marketplace bug * ms-debugpy missing, comment it out * Added python3 * Swapped vscodium for vscode * Opened up ssh * Uhh, typo'd openssh * Removed comment blocks; added GDM banner * Added a wallpaper * Swapped Gnome display mgr for LightDM * Removed hardware-configuration * Revert "Removed hardware-configuration" This reverts commit be986e0. * Made things... aesthetic? * Added discord, removed dmenu (irrelevant for now) * Added tmux, aesthetics config builds * CHanged lightdm theme * Swapped from lightdm to sddm * Added sway window manager * Added SDDM theme * Changed SDDM theme to Dialog * Swapped from 23.11 channels on nixos and home-manager to unstable
diff --git a/continuous-download.sh b/continuous-download.sh
@@ -1,4 +1,4 @@
-#!
+#!/bin/sh
 
 # Set the path to the Git repository
 repo_url="https://github.com/Wittionary/niche-os"
diff --git a/nixos/aesthetics.nix b/nixos/aesthetics.nix
@@ -0,0 +1,16 @@
+# # AESTHETICS --------------------------
+# let 
+#   gruvboxPlus = import ./gruvbox-plus.nix { inherit pkgs; };
+# in
+# {
+#   gtk.enable = true;
+
+#   gtk.cursorTheme.package = pkgs.bibata-cursors;
+#   gtk.cursorTheme.name = "Bibata-Modern-Ice";
+
+#   gtk.theme.package = pkgs.adw-gtk3;
+#   gtk.theme.name = "adw-gtk3";
+
+#   gtk.iconTheme.package = pkgs.adwaita-icon-theme;
+#   gtk.iconTheme.name = "Adwaita"; 
+# }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
@@ -19,6 +19,7 @@
       # Enable flakes and new 'nix' command
       experimental-features = "nix-command flakes";
     };
+    # gc.options = "--delete-older-than +10";
   };
 
   # Bootloader.
@@ -57,13 +58,28 @@
   services.xserver.enable = true;
 
   # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
+  # services.xserver.displayManager.gdm = {
+  #   enable = true;
+  #   banner = ''
+  #           hallo welt
+  #           '';
+  # };
+
   services.xserver.desktopManager.gnome.enable = true;
+  # services.xserver.desktopManager.xfce.enable = true;
+  services.displayManager.sddm = {
+    enable = true;
+    package = pkgs.lib.mkForce pkgs.libsForQt5.sddm; # https://github.com/NixOS/nixpkgs/issues/292761#issuecomment-2094854200
+    extraPackages = pkgs.lib.mkForce [ pkgs.libsForQt5.qt5.qtgraphicaleffects ];
+    # background = ./wallpapers/never-forget.jpg;
+    theme = "sddm-theme-dialog";
+    wayland.enable = true;
+  };
 
   # Configure keymap in X11
   services.xserver = {
-    layout = "us";
-    xkbVariant = "";
+    xkb.layout = "us";
+    xkb.variant = "";
   };
 
   # Enable CUPS to print documents.
@@ -95,25 +111,7 @@
     description = "witt";
     extraGroups = [ "networkmanager" "wheel" ];
     ignoreShellProgramCheck = true; # because home.nix is managing shell
-    packages = with pkgs; [
-      # _1password
-      # azure-cli
-      # awscli2
-      # bat # batcat
-      # firefox
-      # fzf
-      # home-manager # cli
-      # kubectl
-      # lolcat
-
-      # obsidian # v1.4.16 package is out-of-date -> insecure
-
-      # terraform
-      # terragrunt
-      # todoist-electron
-      # vivaldi
-      # vscode-with-extensions
-    ];
+    # packages are in home-manager
   };
   users.defaultUserShell = pkgs.zsh;
   programs.zsh.enable = true;
@@ -128,34 +126,25 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     #_1password
+    (callPackage ./sddm-themes.nix {}).sddm-theme-dialog
     curl
     file
     git-credential-manager
     jq
 
+    lightdm
+    lightdm-gtk-greeter
+
     nmap
     openssl
     podman
     podman-compose
+    python3Minimal
+    tmux
     vim 
     wget
   ];
 
-  # Now lives under home.shellAliases
-  # environment.shellAliases = {
-  #   # ALIASES ---------------------------
-  #   cls="clear";
-  #   d="podman";
-  #   tf="terraform";
-  #   tg="terragrunt";
-  #   kc="kubectl";
-  #   "aws.whoami"="aws iam get-user --query User.Arn --output text";
-  #   "az.whoami"="az ad signed-in-user show --query userPrincipalName --output tsv";
-  #   ".."="cd ..";
-  #   "..."="cd ../..";
-  #   "...."="cd ../../..";
-  # };
-
 
   nixpkgs.config.permittedInsecurePackages = [
     "electron-25.9.0" # for obsidian 1.4.16
@@ -171,26 +160,20 @@
   # };
 
 
-# programs.git = {
-# 	enable = true;
-# 	config = {
-# 		init = {
-# 			defaultBranch = "main";
-# 		};
-#     credential = {
-#       credentialStore = "secretservice";
-#       helper = "${pkgs.git-credential-manager}/bin/git-credential-manager";
-#     };
-#   };
-# };
-
-
-
   # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
+  services.openssh = {
+    enable = true;
+    ports = [ 22 ];
+    settings = {
+      PasswordAuthentication = true;
+    };
+  };
+
+  security.polkit.enable = true; # needed for sway
+  
 
   # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
+  networking.firewall.allowedTCPPorts = [ 22 ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
diff --git a/nixos/gruvbox-plus.nix b/nixos/gruvbox-plus.nix
@@ -0,0 +1,17 @@
+{ pkgs }:
+
+pkgs.stdenv.mkDerivation {
+  name = "gruvbox-plus";
+
+  src = pkgs.fetchUrl {
+    url = "https://github.com/SylEleuth/gruvbox-plus-icon-pack/releases/download/v5.3.1/gruvbox-plus-icon-pack-5.3.1.zip";
+    sha256 = "1mi6197hrwnkm2109pajb3vkwlddrak109281dbwgl1gagklsxny"; # pkgs.lib.fakeSha256 or nix-prefetch-url
+  };
+
+  dontUnpack = true;
+
+  installPhase = ''
+    mkdir -P $out
+    ${pkgs.unzip}/bin/unzip $src -d $out/
+    '';
+}
diff --git a/nixos/home.nix b/nixos/home.nix
@@ -17,11 +17,14 @@ home-manager.useGlobalPkgs = true;
 
   home-manager.users.witt = { pkgs, ... }: {
     home.packages = with pkgs; [
-      _1password
+      _1password-gui
       azure-cli
       awscli2
       bat # batcat
-      
+
+      discord
+      #dmenu-rs # dmenu but extensible and in Rust - https://github.com/Shizcow/dmenu-rs
+
       firefox
       fzf
       
@@ -39,9 +42,28 @@ home-manager.useGlobalPkgs = true;
       todoist-electron
       
       vivaldi
-      vscode-with-extensions      
+      vscode
+      #vscode-with-extensions      
     ];
 
+    # AESTHETICS --------------------------
+    gtk.enable = true;
+
+    gtk.cursorTheme.package = pkgs.bibata-cursors;
+    gtk.cursorTheme.name = "Bibata-Modern-Ice";
+
+    gtk.theme.package = pkgs.adw-gtk3;
+    gtk.theme.name = "adw-gtk3";
+
+    gtk.iconTheme.package = pkgs.gnome.adwaita-icon-theme;
+    gtk.iconTheme.name = "Adwaita"; 
+    
+    # theming engine
+    qt.enable = true;
+    qt.platformTheme.name = "gtk3";
+    qt.style.name = "adwaita-dark";
+    qt.style.package = pkgs.adwaita-qt;
+
     # ALIASES --------------------------
     home.shellAliases = {
       # ALIASES ---------------------------
@@ -70,24 +92,73 @@ home-manager.useGlobalPkgs = true;
       };
       userName = "Witt Allen";
       userEmail = "wittionary@users.noreply.github.com";
-#      config = {
-#        init = {
-#          defaultBranch = "main";
-#        };
-#        credential = {
-#          credentialStore = "secretservice";
-#          helper = "${pkgs.git-credential-manager}/bin/git-credential-manager";
-#        };
-#      };
+      extraConfig = {
+        init = {
+          defaultBranch = "main";
+        };
+        credential = {
+          credentialStore = "secretservice";
+          helper = "${pkgs.git-credential-manager}/bin/git-credential-manager";
+        };
+      };
     };
-    #programs.git-credential-oauth.enable = true; # requires rando to have access to my account
     
+    # VS CODE --------------------------
+    programs.vscode = {
+      enable = true;
+      extensions = with pkgs.vscode-extensions; [
+        # generic
+        mikestead.dotenv
+        eamodio.gitlens
+        ritwickdey.liveserver
+
+        # dev ops stuff
+        github.vscode-github-actions
+        ms-kubernetes-tools.vscode-kubernetes-tools
+        _4ops.terraform
+
+        # frontend / CSS
+        bradlc.vscode-tailwindcss
+
+        # golang  
+        golang.go
+
+        # nix
+        bbenoist.nix
+        jnoortheen.nix-ide
+
+        # powershell
+        ms-vscode.powershell
+        
+        # python
+        ms-python.vscode-pylance
+        ms-python.python
+        #ms-python.debugpy # extension not found? "attribute 'debugpy' missing"
+      ];
+      package = pkgs.vscode; # pkgs.vscode || pkgs.vscodium
+
+      userSettings = {
+        "editor.fontSize" = 16;
+        "explorer.confirmDelete" = false;
+        "explorer.confirmDragAndDrop" = false;
+        "powershell.promptToUpdatePowerShell" = false;
+        "window.zoomLevel" = 1;
+      };
+    };
+
+    # WAYLAND --------------------------
+    wayland.windowManager.sway = {
+      enable = true;
+      # config = rec {
+       
+      # };
+    };
 
     # ZSH --------------------------
     programs.zsh =  {
       enable = true;
       enableCompletion = true;
-      enableAutosuggestions = true;
+      autosuggestion.enable = true;
       history = {
         expireDuplicatesFirst = true; # space savers and clarity makers
         extended = true; # makes the format of the history entry more complicated: "history -fdD" vs "history"
diff --git a/nixos/sddm-themes.nix b/nixos/sddm-themes.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub }:
+{
+  sddm-theme-dialog = stdenv.mkDerivation rec {
+    pname = "sddm-theme-dialog";
+    version = "53f81e3";
+    dontBuild = true;
+    installPhase = ''
+      mkdir -p $out/share/sddm/themes
+      cp -aR $src $out/share/sddm/themes/sddm-theme-dialog
+    '';
+    src = fetchFromGitHub {
+      owner = "joshuakraemer";
+      repo = "sddm-theme-dialog";
+      rev = "53f81e322f715d3f8e3f41c38eb3774b1be4c19b";
+      sha256 = "qoLSRnQOvH3rAH+G1eRrcf9ZB6WlSRIZjYZBOTkew/0=";
+    };
+  };
+}
+
+# { stdenv, fetchFromGitHub }:
+# {
+#   sddm-sugar-dark = stdenv.mkDerivation rec {
+#     pname = "sddm-sugar-dark-theme";
+#     version = "1.2";
+#     dontBuild = true;
+#     installPhase = ''
+#       mkdir -p $out/share/sddm/themes
+#       cp -aR $src $out/share/sddm/themes/sugar-dark
+#     '';
+#     src = fetchFromGitHub {
+#       owner = "MarianArlt";
+#       repo = "sddm-sugar-dark";
+#       rev = "v${version}";
+#       sha256 = "0gx0am7vq1ywaw2rm1p015x90b75ccqxnb1sz3wy8yjl27v82yhb";
+#     };
+#   };
+# }
diff --git a/nixos/wallpapers/never-forget.jpg b/nixos/wallpapers/never-forget.jpg
diff --git a/setup-symlink.sh b/setup-symlink.sh
@@ -1,4 +1,4 @@
-#!
+#!/bin/sh
 # Points the system directory over to the git-managed configurations
 
 NIXOS_DIR="/etc/nixos/"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!`
	`1`	`+#!/bin/sh`
`2`	`2`
`3`	`3`	`# Set the path to the Git repository`
`4`	`4`	`repo_url="https://github.com/Wittionary/niche-os"`