fix flutter flake

packages/#default.nix#

@@ -0,0 +1,16 @@
+{ ... }:
+{
+  imports = [
+#    ./ags
+    ./other
+    ./sway
+    ./waybar
+    ./wpaperd
+    ./nvim
+    ./emacs
+    ./kitty
+    ./rofi
+#    ./hyprland
+#    ./vscode
+  ];
+}

packages/default.nix

@@ -9,7 +9,7 @@
     ./nvim
     ./emacs
     ./kitty
-#    ./qutebrowser
+    ./rofi
 #    ./hyprland
 #    ./vscode
   ];

packages/default.nix~

@@ -9,7 +9,6 @@
     ./nvim
     ./emacs
     ./kitty
-    ./qutebrowser
 #    ./hyprland
 #    ./vscode
   ];

packages/emacs/default.nix

@@ -12,6 +12,7 @@ in {
 (telephone-line-mode 1)
 (xterm-mouse-mode 1)
 
+
 (setq evil-want-C-u-scroll t)
 
 (menu-bar--display-line-numbers-mode-relative)
@@ -137,9 +138,6 @@ in {
   :hook (dired-mode . treemacs-icons-dired-enable-once)
   :ensure t)
 
-(use-package treemacs-magit
-  :after (treemacs magit)
-  :ensure t)
 
 (use-package treemacs-persp ;;treemacs-perspective if you use perspective.el vs. persp-mode
   :after (treemacs persp-mode) ;;or perspective vs. persp-mode
@@ -232,13 +230,14 @@ in {
 
 (setq lsp-keymap-prefix "C-c l")
 (require 'lsp-mode)
-
+(evil-set-undo-system 'undo-redo)
 (flycheck-inline-mode nil)
+(global-evil-vimish-fold-mode 1)
     '';
     package = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
-    catppuccin-theme
       ])
-      ++ (with epkgs.melpaPackages; [
+    ++ (with epkgs.melpaPackages; [
+  catppuccin-theme
 	evil
 	nix-mode
   lsp-treemacs
@@ -258,6 +257,8 @@ in {
   which-key
   magit
   format-all
+  evil-vimish-fold
+  affe
       ])
       ++ (with epkgs.elpaPackages; [
   undo-tree

packages/emacs/default.nix~

@@ -232,6 +232,8 @@ in {
 
 (setq lsp-keymap-prefix "C-c l")
 (require 'lsp-mode)
+
+(flycheck-inline-mode nil)
     '';
     package = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
     catppuccin-theme

packages/emacs/flutter/flake.nix

@@ -36,7 +36,6 @@ outputs = { self, nixpkgs, flake-utils }:
             flutter
             androidSdk # The customized SDK that we've made above
             jdk17
-            vscode
 
             (vscode-with-extensions.override {
               vscode = vscodium;

packages/emacs/flutter/flake.nix~

@@ -0,0 +1,60 @@
+{
+description = "Flutter 3.13.x";
+inputs = {
+  nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  flake-utils.url = "github:numtide/flake-utils";
+};
+outputs = { self, nixpkgs, flake-utils }:
+  flake-utils.lib.eachDefaultSystem (system:
+    let
+      pkgs = import nixpkgs {
+        inherit system;
+        config = {
+          android_sdk.accept_license = true;
+          allowUnfree = true;
+        };
+      };
+      buildToolsVersion = "34.0.0";
+      androidComposition = pkgs.androidenv.composeAndroidPackages {
+        buildToolsVersions = [ buildToolsVersion "33.0.1" ];
+        platformVersions = [ "34" "33" "28" ];
+        abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+      };
+      androidSdk = androidComposition.androidsdk;
+    in
+    {
+      devShell =
+        with pkgs; mkShell rec {
+          shellHook = ''
+            nu
+            exit
+          '';
+          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/libexec/android-sdk/build-tools/33.0.1/aapt2";   
+
+          ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+          buildInputs = [
+            flutter
+            androidSdk # The customized SDK that we've made above
+            jdk17
+            vscode
+
+            (vscode-with-extensions.override {
+              vscode = vscodium;
+              vscodeExtensions = with vscode-extensions; [
+                vscodevim.vim
+                dart-code.dart-code
+                dart-code.flutter
+              ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace[
+                {
+                  name = "awesome-flutter-snippets";
+                  publisher = "nash";
+                  version = "4.0.1";
+                  sha256 = "lXdos/xB18h3Z0YfkgEk55G2JvRMYudUUIltugQjylU=";
+                }
+              ];
+            })
+          ];
+
+        };
+    });
+}

packages/kitty/default.nix~

@@ -5,25 +5,6 @@
 
  ];
 
-
-
-programs.nushell = {
-  enable = true;
-  extraConfig = ''
-    $env.config = {
-      show_banner: false,
-      edit_mode: vi
-    }
-  '';
-  shellAliases = { 
-    update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
-    emacs = "emacs -nw";
-    femacs = "emacs -nw --load /home/n/Documents/Shells/flutter/init.el";
-    pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
-  };
-};
-
-
 programs.starship = {
   enable = true;
 
@@ -32,10 +13,6 @@ programs.starship = {
   };
 };
 
-programs.carapace = {
-  enable = true;
-  enableNushellIntegration = true;
-};
 
 
 programs.zsh = {
@@ -83,7 +60,6 @@ programs.kitty = {
 ## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
 ## blurb:    Soothing pastel theme for the high-spirited!
 
-map ctrl+shift+w no_op
 
 
 # The basic colors

packages/other/default.nix

@@ -30,4 +30,5 @@ services.kdeconnect = {
 
 
 
+
 }

packages/other/default.nix~

@@ -0,0 +1,37 @@
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+
+ ];
+
+programs.ranger = {
+  enable = true;
+  extraConfig = ''
+set preview_images true
+set preview_images_method kitty
+  '';
+};
+
+
+programs.git = {
+  enable = true;
+  userName = "Nico";
+  userEmail = "nicovessen@gmail.com";
+  extraConfig = {
+    safe.directory = "/etc/nixos";
+  };
+};
+
+
+services.kdeconnect = {
+  enable = true;
+  indicator = true;
+};
+
+programs.obsidian = {
+  enable = true;
+};
+
+
+
+}

packages/rofi/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+   rofi-screenshot
+   rofi-power-menu
+ ];
+
+
+ programs.rofi = {
+   enable = true;
+   theme = "/etc/nixos/packages/rofi/themes/catppuccin-mocha";
+   plugins = [
+     pkgs.rofi-power-menu
+   ];
+ };
+}

packages/rofi/default.nix~

@@ -0,0 +1,17 @@
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+   rofi-screenshot
+   rofi-power-menu
+   bitwarden-menu
+ ];
+
+
+ programs.rofi = {
+   enable = true;
+   theme = "/etc/nixos/packages/rofi/themes/catppuccin-mocha";
+   plugins = [
+     pkgs.rofi-power-menu
+   ];
+ };
+}

packages/rofi/themes/catppuccin-mocha.rasi

@@ -0,0 +1,111 @@
+* {
+    bg-col:  #1e1e2e;
+    bg-col-light: #1e1e2e;
+    border-col: #1e1e2e;
+    selected-col: #1e1e2e;
+    blue: #89b4fa;
+    fg-col: #cdd6f4;
+    fg-col2: #f38ba8;
+    grey: #6c7086;
+
+    width: 600;
+    font: "JetBrainsMono Nerd Font 14";
+}
+
+element-text, element-icon , mode-switcher {
+    background-color: inherit;
+    text-color:       inherit;
+}
+
+window {
+    height: 360px;
+    border: 3px;
+    border-color: @border-col;
+    background-color: @bg-col;
+}
+
+mainbox {
+    background-color: @bg-col;
+}
+
+inputbar {
+    children: [prompt,entry];
+    background-color: @bg-col;
+    border-radius: 5px;
+    padding: 2px;
+}
+
+prompt {
+    background-color: @blue;
+    padding: 6px;
+    text-color: @bg-col;
+    border-radius: 3px;
+    margin: 20px 0px 0px 20px;
+}
+
+textbox-prompt-colon {
+    expand: false;
+    str: ":";
+}
+
+entry {
+    padding: 6px;
+    margin: 20px 0px 0px 10px;
+    text-color: @fg-col;
+    background-color: @bg-col;
+}
+
+listview {
+    border: 0px 0px 0px;
+    padding: 6px 0px 0px;
+    margin: 10px 0px 0px 20px;
+    columns: 2;
+    lines: 5;
+    background-color: @bg-col;
+}
+
+element {
+    padding: 5px;
+    background-color: @bg-col;
+    text-color: @fg-col  ;
+}
+
+element-icon {
+    size: 25px;
+}
+
+element selected {
+    background-color:  @selected-col ;
+    text-color: @fg-col2  ;
+}
+
+mode-switcher {
+    spacing: 0;
+  }
+
+button {
+    padding: 10px;
+    background-color: @bg-col-light;
+    text-color: @grey;
+    vertical-align: 0.5; 
+    horizontal-align: 0.5;
+}
+
+button selected {
+  background-color: @bg-col;
+  text-color: @blue;
+}
+
+message {
+    background-color: @bg-col-light;
+    margin: 2px;
+    padding: 2px;
+    border-radius: 5px;
+}
+
+textbox {
+    padding: 6px;
+    margin: 20px 0px 0px 20px;
+    text-color: @blue;
+    background-color: @bg-col-light;
+}

packages/sway/default.nix

@@ -13,24 +13,26 @@
       
       startup = [
         # Launch Firefox on start
-	{command = "wpaperd";}
+#	      {command = "wpaperd";}
       ];
     };
 
 
     extraConfig = ''
+## screens
+#output DP-3 scale 0.9
+#output DP-2 pos 0 0
+
+workspace 10 output DP-3
+for_window [class="Spotify"] scratchpad show
+
       ## Input configuration
       input "type:keyboard" {
-        xkb_layout de
+        xkb_layout de,us
         xkb_variant "nodeadkeys"
+        xkb_options grp:alt_shift_toggle
       }
 
-input "type:touchpad" {
-    tap enabled         # enables click-on-tap
-    tap_button_map lrm  # tap with 1 finger = left click, 2 fingers = right click, 3 fingers = middle click
-    dwt disabled         # disable (touchpad) while typing
-    dwtp disabled        # disable (touchpad) while track pointing
-}
 
       # Brightness
       bindsym XF86MonBrightnessDown exec light -U 10
@@ -42,7 +44,10 @@ input "type:touchpad" {
       bindsym XF86AudioMute exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
 
       # app launcher
-      bindsym Mod4+m exec 'kickoff'
+	      bindsym Mod4+m exec 'rofi -show drun'
+      bindsym Mod4+Shift+x exec 'rofi -show power-menu -modi power-menu:rofi-power-menu'
+      bindsym Mod4+Print exec 'rofi-screenshot'
+
       bindsym Mod4+BackSpace kill
 
       # disable window border

packages/sway/default.nix~

@@ -0,0 +1,60 @@
+{ config, pkgs, inputs, ... }:
+
+{
+  wayland.windowManager.sway = {
+    enable = true;
+    config = rec {
+      modifier = "Mod4";
+      # Use kitty as default terminal
+      terminal = "kitty"; 
+      bars = [
+	{command = "waybar";}
+        ];
+      
+      startup = [
+        # Launch Firefox on start
+#	      {command = "wpaperd";}
+      ];
+    };
+
+
+    extraConfig = ''
+## screens
+#output DP-3 scale 0.9
+#output DP-2 pos 0 0
+
+workspace 10 output DP-3
+for_window [class="Spotify"] scratchpad show
+
+      ## Input configuration
+      input "type:keyboard" {
+        xkb_layout de, us
+        xkb_variant "nodeadkeys"
+        xkb_options grp:alt_shift_toggle
+      }
+
+
+      # Brightness
+      bindsym XF86MonBrightnessDown exec light -U 10
+      bindsym XF86MonBrightnessUp exec light -A 10
+
+      # Volume
+      bindsym XF86AudioRaiseVolume exec 'pactl set-sink-volume @DEFAULT_SINK@ +1%'
+      bindsym XF86AudioLowerVolume exec 'pactl set-sink-volume @DEFAULT_SINK@ -1%'
+      bindsym XF86AudioMute exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
+
+      # app launcher
+	      bindsym Mod4+m exec 'rofi -show drun'
+      bindsym Mod4+Shift+x exec 'rofi -show power-menu -modi power-menu:rofi-power-menu'
+      bindsym Mod4+Print exec 'rofi-screenshot'
+
+      bindsym Mod4+BackSpace kill
+
+      # disable window border
+default_border pixel 2
+font pango:monospace 0.001
+titlebar_padding 1
+titlebar_border_thickness 0
+    '';
+  };
+}

packages/waybar/config

@@ -5,7 +5,13 @@
   "spacing": 0,
   "modules-left": ["clock", "sway/workspaces","sway/mode"],
   "modules-center": ["sway/window"],
-  "modules-right": ["network","battery", "pulseaudio", "tray"],
+  "modules-right": ["network", "cpu", "memory", "custom/keyboard-layout", "pulseaudio", "tray"],
+
+"custom/keyboard-layout": {
+  "interval": 1,
+  "exec": "swaymsg -t get_inputs | jq -r '.[] | select(.type == \"keyboard\") | .xkb_active_layout_name'"
+},
+
 
   "cpu": {
     "interval": 5,
@@ -17,19 +23,6 @@
     "format": "RAM: {used} GiB"
   },
 
-  "battery": {
-    "bat": "BAT0",
-    "states": {
-      "good": 90,
-      "warning": 20,
-      "critical": 7
-    },
-    "format": "{icon}  {capacity}%",
-        "format-charging": " {capacity}%",
-        "format-plugged": " {capacity}%",
-        "format-alt": "{time}  {icon}",
-        "format-icons": ["",  "", "" , "", ""] 
-  },
 
   "pulseaudio": {
     "format": "{icon}   {volume}%",

packages/waybar/config~

@@ -0,0 +1,56 @@
+{
+  "layer": "bottom",
+  "position": "top",
+  "height": 35,
+  "spacing": 0,
+  "modules-left": ["clock", "sway/workspaces","sway/mode"],
+  "modules-center": ["sway/window"],
+  "modules-right": ["network", "battery", "cpu", "memory", "custom/keyboard-layout", "pulseaudio", "tray"],
+
+"custom/keyboard-layout": {
+  "interval": 1,
+  "exec": "swaymsg -t get_inputs | jq -r '.[] | select(.type == \"keyboard\") | .xkb_active_layout_name'"
+},
+
+
+  "cpu": {
+    "interval": 5,
+    "format": "CPU: {usage}% {avg_frequency} GHz"
+  },
+
+  "memory": {
+    "interval": 5,
+    "format": "RAM: {used} GiB"
+  },
+
+  "battery": {
+    "bat": "BAT0",
+    "states": {
+      "good": 90,
+      "warning": 20,
+      "critical": 7
+    },
+    "format": "{icon}  {capacity}%",
+        "format-charging": " {capacity}%",
+        "format-plugged": " {capacity}%",
+        "format-alt": "{time}  {icon}",
+        "format-icons": ["",  "", "" , "", ""] 
+  },
+
+  "pulseaudio": {
+    "format": "{icon}   {volume}%",
+    "format-muted": " Muted",
+    "format-icons": ["", "", ""]
+  },
+
+  "clock": {
+    "format": "{:%d.%m.%Y | %H:%M}"
+  },
+
+  "network": {
+    "format-wifi": "   {essid} {signalStrength}%",
+    "format-disconnected": "  No Connection"
+  }
+
+
+}

packages/waybar/default.nix

@@ -1,7 +1,7 @@
 { pkgs, config, lib,... }:
 {
  home.packages = with pkgs; [
-
+   jq
  ];
 
  home.file =

packages/waybar/default.nix~

@@ -0,0 +1,15 @@
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+
+ ];
+
+ home.file =
+  lib.mkMerge [
+   {
+    ".config/waybar/config".source = ./config;
+    ".config/waybar/style.css".source = ./style.css;
+    ".config/waybar/mocha.css".source = ./mocha.css;
+   }
+  ];
+}

packages/waybar/style.css

@@ -21,6 +21,7 @@ window#waybar {
 #memory,
 #network,
 #pulseaudio,
+#custom-keyboard-layout,
 #battery{
 	background: rgba(10,10,10,100);
 	opacity: 0.8;

packages/waybar/style.css~

@@ -0,0 +1,78 @@
+@import "mocha.css";
+
+* {
+	border: none;
+	border-radius: 0;
+	font-family: "Fira Code";
+	font-weight: bold;
+	font-size: 13px;
+	min-height: 0;
+}
+
+window#waybar {
+/*	background: rgba(0,130,130,0); */
+	background: @base;
+}
+
+#clock,
+#workspaces,
+#window,
+#cpu,
+#memory,
+#network,
+#pulseaudio,
+#battery{
+	background: rgba(10,10,10,100);
+	opacity: 0.8;
+/*	color: #00ffff; */
+	color: @mauve;
+	padding: 0px 10px ;
+	margin: 3px 0px;
+}
+
+#workspaces button{
+	color: @mauve;
+	border-radius: 7px;
+	margin: 3px 0px;
+	margin-left: 6px;
+}
+
+#workspaces button.focused{
+	background: @mauve;
+	color: @base;
+	opacity: 0.8;
+	transition: 0.3s;
+}
+
+#workspaces button:hover{
+	background: @mauve;
+	color: @base;
+	opacity: 0.8;
+	transition: 0.5s;
+}
+
+#window{
+	border-radius: 10px;
+}
+
+#waybar.empty #window {
+	background: none;
+}
+
+#network{
+	border-radius: 10px 0px 0px 10px;
+}
+
+#pulseaudio{
+	border-radius: 0px 10px 10px 0px;
+	margin-right: 5px
+}
+
+#workspaces{
+	border-radius: 0px 10px 10px 0px;
+}
+
+#clock{
+	border-radius: 10px 0px 0px 10px;
+	margin-left: 5px
+}