update theme

profiles/applications/alacritty.nix

@@ -15,19 +15,19 @@ with config.deviceSpecific;
       settings = {
         font = {
           normal = {
-            family = "${thm.fonts.powerline.family}";
+            family = "${thm.fonts.mono.family}";
             style = "Regular";
           };
           bold = {
-            family = "${thm.fonts.powerline.family}";
+            family = "${thm.fonts.mono.family}";
             style = "Bold";
           };
           italic = {
-            family = "${thm.fonts.powerline.family}";
+            family = "${thm.fonts.mono.family}";
             style = "Italic";
           };
           bold_italic = {
-            family = "${thm.fonts.powerline.family}";
+            family = "${thm.fonts.mono.family}";
             style = "Bold Italic";
           };
           size = thm.fontSizes.small.int;

profiles/applications/kitty.nix

@@ -10,7 +10,7 @@ in with config.deviceSpecific;
   home-manager.users.alukard = {
     programs.kitty = {
       enable = true;
-      font.name = "${thm.fonts.powerline.family} ${thm.fontSizes.small.str}";
+      font.name = "${thm.fonts.mono.family} ${thm.fontSizes.small.str}";
       # keybindings = ''
       # '';
       settings = {

profiles/applications/vscode/default.nix

@@ -34,9 +34,10 @@ in
       userSettings = {
         "update.mode" = "none";
         "telemetry.telemetryLevel" = "off";
-        "editor.fontFamily" = "'Victor Mono', 'Fira Code', 'Font Awesome 5 Free', 'Font Awesome 5 Free Solid', 'Material Icons'";
+        #"editor.fontFamily" = "'Victor Mono Nerd Font', 'Fira Code', 'Font Awesome 5 Free', 'Font Awesome 5 Free Solid', 'Material Icons'";
+        "editor.fontFamily" = "'VictorMono Nerd Font Medium'";
         "editor.fontLigatures" = true;
-        "editor.fontWeight" = "600";
+        #"editor.fontWeight" = "600";
         "editor.fontSize" = 16;
         "workbench.iconTheme" = "eq-material-theme-icons-palenight";
         "workbench.colorTheme" = "Tokyo Night";
@@ -79,7 +80,7 @@ in
         "dart.debugSdkLibraries" = true;
         "dart.checkForSdkUpdates" = false;
         "window.menuBarVisibility" = "toggle";
-        "terminal.integrated.fontFamily" = "IBM Plex Mono";
+        "terminal.integrated.fontFamily" = "FiraCode Nerd Font";
         "terminal.integrated.fontWeight" = "500";
         "files.watcherExclude" = {
             "**/.direnv" = true;

profiles/overlay.nix

@@ -23,12 +23,13 @@ with lib; {
         bibata-cursors-tokyonight = pkgs.callPackage ./packages/bibata-cursors-tokyonight.nix { };
         ceserver = pkgs.callPackage ./packages/ceserver.nix { };
         hyprpaper = pkgs.callPackage ./packages/hyprpaper.nix { src = inputs.hyprpaper; };
-#         ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { };
         kitti3 = pkgs.python3Packages.callPackage ./packages/kitti3.nix { };
         microbin = pkgs.callPackage ./packages/microbin-pkg { };
         mpris-ctl = pkgs.callPackage ./packages/mpris-ctl.nix { };
         parsec = pkgs.callPackage ./packages/parsec.nix { };
         reshade-shaders = pkgs.callPackage ./packages/reshade-shaders.nix { };
+        rosepine-gtk-theme = pkgs.callPackage ./packages/rosepine-gtk-theme.nix { };
+        rosepine-icon-theme = pkgs.callPackage ./packages/rosepine-icon-theme.nix { };
         seadrive-fuse = pkgs.callPackage ./packages/seadrive-fuse.nix { };
         tidal-dl = pkgs.callPackage ./packages/tidal-dl.nix { };
         tokyonight-gtk-theme = pkgs.callPackage ./packages/tokyonight-gtk-theme.nix { };

profiles/packages/ibm-plex-powerline.nix

@@ -1,38 +0,0 @@
-{ python3Packages, python2, fetchFromGitHub, fetchzip }:
-let
-  fontpatcher = python3Packages.buildPythonApplication rec {
-    name = "fontpatcher";
-    src = fetchFromGitHub {
-      owner = "powerline";
-      repo = "fontpatcher";
-      rev = "c3488091611757cb02014ed7ed2f11be0208da83";
-      sha256 = "1261h8233spflbbwbjz9w9bxcmznjldxwff08xn2cly6r9f49a0s";
-    };
-    propagatedBuildInputs = [
-      python2
-      python3Packages.fontforge
-    ];
-    doCheck = false;
-    preFixup = ''
-      mkdir -p $out/fonts
-      cp fonts/* $out/fonts
-    '';
-  };
-
-  version = "6.0.0";
-in fetchzip {
-  name = "ibm-plex-powerline-${version}";
-
-  url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
-
-  postFetch = ''
-    mkdir -p $out/share/fonts/opentype
-    unzip -j $downloadedFile "OpenType/*/IBMPlexMono*.otf" -d $out/share/fonts/opentype
-    cd $out/share/fonts/opentype
-    ${fontpatcher}/bin/powerline-fontpatcher $out/share/fonts/opentype/*
-    rm -f $out/share/fonts/opentype/IBMPlex*
-  '';
-
-  sha256 = "sha256-doBe3rNMrPjNG7zRGuCAV7w1iT49A7UROjtMapcjXUk=";
-}
-

profiles/packages/rosepine-gtk-theme.nix

@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, gtk-engine-murrine
+, jdupes
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rosepine-gtk-theme";
+  version = "unstable-2022-09-03";
+
+  src = fetchFromGitHub {
+    owner = "Fausto-Korpsvart";
+    repo = "Rose-Pine-GTK-Theme";
+    rev = "1ffc697c6bed594c262647b0ec01e5f3de5a5e77";
+    sha256 = "1psdrf3hfq8h7lhz75j4780r5p9l6cjmsrpfwhk4yyi4hbyk1n9c";
+  };
+
+  nativeBuildInputs = [ jdupes ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/themes
+    cp -a themes/Rosepine* $out/share/themes
+
+    # Replace duplicate files with hardlinks to the first file in each
+    # set of duplicates, reducing the installed size
+    jdupes -L -r $out/share
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A GTK theme with the Rosé Pine colour palette";
+    homepage = "https://github.com/Fausto-Korpsvart/Rose-Pine-GTK-Theme";
+    license = licenses.gpl3Only;
+    platforms = platforms.all;
+    maintainers = [ ];
+  };
+}

profiles/packages/rosepine-icon-theme.nix

@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, gtk-engine-murrine
+, jdupes
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rosepine-icon-theme";
+  version = "unstable-2022-09-03";
+
+  src = fetchFromGitHub {
+    owner = "Fausto-Korpsvart";
+    repo = "Rose-Pine-GTK-Theme";
+    rev = "1ffc697c6bed594c262647b0ec01e5f3de5a5e77";
+    sha256 = "1psdrf3hfq8h7lhz75j4780r5p9l6cjmsrpfwhk4yyi4hbyk1n9c";
+  };
+
+  nativeBuildInputs = [ jdupes ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/icons
+    cp -a icons/Rose-Pine* $out/share/icons
+
+    # Replace duplicate files with hardlinks to the first file in each
+    # set of duplicates, reducing the installed size
+    jdupes -L -r $out/share
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "A GTK theme with the Rosé Pine colour palette";
+    homepage = "https://github.com/Fausto-Korpsvart/Rose-Pine-GTK-Theme";
+    license = licenses.gpl3Only;
+    platforms = platforms.all;
+    maintainers = [ ];
+  };
+}

profiles/themes.nix

@@ -2,12 +2,12 @@
 
   config.themes.base16 = with config.deviceSpecific.devInfo; {
     enable = true;
-    customScheme = {
+    # customScheme = {
-      enable = true;
+    #   enable = true;
-      path = "${inputs.base16-tokyonight-scheme}/tokyonight-night.yaml";
+    #   path = "${inputs.base16-tokyonight-scheme}/tokyonight-night.yaml";
-    };
+    # };
-    # scheme = "gruvbox";
+    scheme = "rose-pine";
-    # variant = "gruvbox-dark-medium";
+    variant = "rose-pine";
     extraParams = {
       fonts = {
         main = {
@@ -19,11 +19,7 @@
           size = 12;
         };
         mono = {
-          family = "IBM Plex Mono";
+          family = "VictorMono Nerd Mono";
-          size = 12;
-        };
-        powerline = {
-          family = "IBM Plex Mono";
           size = 12;
         };
         icon = {
@@ -63,10 +59,10 @@
         };
       };
 
-      # iconTheme = "Papirus-Dark";
+      # iconTheme = "tokyonight_dark";
-      # iconPackage = pkgs.papirus-icon-theme;
+      # iconPackage = pkgs.tokyonight-icon-theme;
-      iconTheme = "tokyonight_dark";
+      iconTheme = "Rose-Pine";
-      iconPackage = pkgs.tokyonight-icon-theme;
+      iconPackage = pkgs.rosepine-icon-theme;
 
       cursorPackage = pkgs.bibata-cursors-tokyonight;
       # cursorPackage = pkgs.bibata-cursors;

profiles/workspace/fonts.nix

@@ -6,11 +6,8 @@ in
   fonts = {
     fonts = with pkgs; [
       ibm-plex
-#       ibm-plex-powerline
+      (nerdfonts.override { fonts = [ "FiraCode" "VictorMono" ]; })
       fira-code
-      roboto
-      roboto-mono
-      roboto-slab
       victor-mono
       # Icons
       font-awesome

profiles/workspace/gtk.nix

@@ -41,20 +41,20 @@ in {
         name = "${thm.iconTheme}";
         package = thm.iconPackage;
       };
-      theme = {
-        name = "Generated";
-        package = pkgs.generated-gtk-theme;
-      };
       # theme = {
-      #   name = "Tokyonight-Dark-BL";
+      #   name = "Generated";
-      #   package = pkgs.tokyonight-gtk-theme;
+      #   package = pkgs.generated-gtk-theme;
       # };
+      theme = {
+        name = "Rosepine-BL";
+        package = pkgs.rosepine-gtk-theme;
+      };
       font = {
         name = "${thm.fonts.main.family}";
         size = thm.fontSizes.normal.int;
       };
     };
-    home.sessionVariables.GTK_THEME = "Generated";
+    # home.sessionVariables.GTK_THEME = "Generated";
-    # home.sessionVariables.GTK_THEME = "Tokyonight-Dark-BL";
+    home.sessionVariables.GTK_THEME = "Rosepine-BL";
   };
 }

profiles/workspace/zsh/default.nix

@@ -7,7 +7,7 @@
     programs = {
       zsh = {
         enable = true;
-        enableAutosuggestions = true;
+        # enableAutosuggestions = true;
         enableCompletion = true;
         oh-my-zsh = {
           enable = true;
@@ -15,11 +15,11 @@
           plugins = [ "git" "dirhistory" ];
         };
         plugins = [
-          # {
+          {
-          #   name = "zsh-nix-shell";
+            name = "zsh-nix-shell";
-          #   file = "nix-shell.plugin.zsh";
+            file = "nix-shell.plugin.zsh";
-          #   src = inputs.zsh-nix-shell;
+            src = inputs.zsh-nix-shell;
-          # }
+          }
           {
             name = "zsh-autosuggestions";
             src = inputs.zsh-autosuggestions;
@@ -28,6 +28,16 @@
             name = "you-should-use";
             src = inputs.zsh-you-should-use;
           }
+          {
+            name = "powerlevel10k-config";
+            src = ./.;
+            file = "p10k.zsh";
+          }
+          {
+            name = "zsh-powerlevel10k";
+            src = pkgs.zsh-powerlevel10k;
+            file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
+          }
         ];
 
         dotDir = ".config/zsh";
@@ -53,47 +63,19 @@
           "nb" = "nix build";
           "nr" = "nix run";
           "e" = "$EDITOR";
-          "q" = "qalc";
+          "q" = "${pkgs.libqalculate}/bin/qalc";
           # "grep" = "${pkgs.ripgrep}/bin/rg";
           "man" = "${pkgs.pinfo}/bin/pinfo";
-          "l" = "exa -lahgF@ --git --group-directories-first";
+          "l" = "${pkgs.exa}/bin/exa -lahgF@ --git --group-directories-first";
-          "tree" = "exa -T";
+          "tree" = "${pkgs.exa}/bin/exa -T";
-          "ltree" = "exa -lhgFT@ --git";
+          "ltree" = "${pkgs.exa}/bin/exa -lhgFT@ --git";
-          "atree" = "exa -aT";
+          "atree" = "${pkgs.exa}/bin/exa -aT";
-          "latree" = "exa -lahgFT@ --git";
+          "latree" = "${pkgs.exa}/bin/exa -lahgFT@ --git";
           # "gif2webm" = "(){ ${pkgs.ffmpeg.bin}/bin/ffmpeg -i $1 -c:v libvpx-vp9 -crf 20 -b:v 0 $1.webm ;}";
           "hpc" = "bluetoothctl connect D8:37:3B:60:5D:55";
           "hpd" = "bluetoothctl disconnect D8:37:3B:60:5D:55";
         };
         initExtra = ''
-          nixify() {
-            if [ ! -e ./.envrc ]; then
-              echo 'use flake' > .envrc
-              direnv allow
-            fi
-            if [ ! -e flake.nix ]; then
-              cat > flake.nix <<'EOF'
-          {
-            description = "shell environment";
-
-            inputs = {
-              nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
-            };
-
-            outputs = { self, nixpkgs, ... }@inputs: {
-              devShell.x86_64-linux = let
-                pkgs = import nixpkgs { config.allowUnfree = true; localSystem = "x86_64-linux"; };
-              in pkgs.mkShell {
-                nativeBuildInputs = [ ];
-                buildInputs = with pkgs; [ ];
-                shellHook = "";
-              };
-            };
-          }
-          EOF
-            fi
-          }
-
           rga-fzf() {
             RG_PREFIX="rga --files-with-matches"
             local file
@@ -113,9 +95,8 @@
 
           XDG_DATA_DIRS=$XDG_DATA_DIRS:$GSETTINGS_SCHEMAS_PATH
 
-          source ${pkgs.nix-zsh-completions}/share/zsh/plugins/nix/nix-zsh-completions.plugin.zsh
+          PS1="$PS1
-          fpath=(${pkgs.nix-zsh-completions}/share/zsh/site-functions $fpath)
+          $ "
-          autoload -U compinit && compinit
         '';
       };