diff --git a/flake.nix b/flake.nix
index 56dd344..93205ac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,7 @@
       pkgs = import nixpkgs { inherit system; };
       pkgsUnstable = import nixpkgs-unstable { inherit system; };
     in {
+      formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
       nixosConfigurations.dn-nix = nixpkgs.lib.nixosSystem {
         modules =
           [ 
diff --git a/home/config/btop/btop.conf b/home/config/btop/btop.conf
old mode 100644
new mode 100755
diff --git a/home/config/btop/themes/catppuccin_macchiato.theme b/home/config/btop/themes/catppuccin_macchiato.theme
old mode 100644
new mode 100755
diff --git a/home/config/hypr/bind.conf b/home/config/hypr/bind.conf
old mode 100644
new mode 100755
index 1dd4407..083aab3
--- a/home/config/hypr/bind.conf
+++ b/home/config/hypr/bind.conf
@@ -1,16 +1,16 @@
 $mainMod = SUPER
 
-bind = $mainMod, T, exec, kitty
+bind = CTRL ALT, T, exec, kitty
 bind = $mainMod, Return, exec, kitty
 bind = $mainMod, Q, killactive, 
 bind = $mainMod, M, exec, wlogout --protocol layer-shell
 bind = $mainMod, E, exec, thunar 
 bind = $mainMod, V, togglefloating, 
-bind = $mainMod, D, exec, wofi --show drun
+bind = ALT, SPACE, exec, wofi --show drun
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, S, togglesplit, # dwindle
-bind = $mainMod SHIFT, Q, exec, swaylock
-bind = , PRINT, exec, hyprshot -m region --clipboard-only
+bind = CTRL&$mainMod&SHIFT, L, exec, swaylock
+bind = $mainMod SHIFT, s, exec, hyprshot -m region --clipboard-only
 
 bind = $mainMod, h, movefocus, l
 bind = $mainMod, l, movefocus, r
@@ -49,8 +49,31 @@ bind = $mainMod SHIFT, h, movewindow, l
 bind = $mainMod SHIFT, k, movewindow, u
 bind = $mainMod SHIFT, j, movewindow, d
 
-bind = $mainMod, f, exec, firefox
+bind = $mainMod, f, exec, opera
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
+
+# Media
+bind = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%+
+bind = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%-
+bind = ,XF86AudioPrev, exec, playerctl previous
+bind = ,XF86AudioNext, exec, playerctl next 
+bind = ,XF86AudioPlay, exec, playerctl play-pause
+bind = ,XF86AudioStop, exec, playerctl stop 
+bind = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle 
+
+# F override (neo65)
+# bind = ,code:232, exec, xdotool key F1
+# bind = ,code:233, exec, xdotool key F2
+# bind = ,code:128, exec, xdotool key F3
+# bind = ,code:212, exec, xdotool key F4
+# bind = ,code:237, exec, xdotool key F5
+# bind = ,code:238, exec, xdotool key F6
+# bind = ,code:173, exec, xdotool key F7
+# bind = ,code:172, exec, xdotool key F8
+# bind = ,code:171, exec, xdotool key F9
+# bind = ,code:121, exec, xdotool key F10
+# bind = ,code:122, exec, xdotool key F11
+# bind = ,code:123, exec, xdotool key F12
diff --git a/home/config/hypr/exec.conf b/home/config/hypr/exec.conf
old mode 100644
new mode 100755
index af57be9..de016b5
--- a/home/config/hypr/exec.conf
+++ b/home/config/hypr/exec.conf
@@ -4,4 +4,6 @@ exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = waybar & hyprpaper
 exec-once = swayidle -w
 exec-once = nwg-look -a
-exec-once = [workspace 2 silent] firefox
+exec-once = [silent] fcitx5 -d -r &
+exec-once = [silent] fcitx5-remote -r &
+exec = hyprsunset -t 3000k &
diff --git a/home/config/hypr/hyprland.conf b/home/config/hypr/hyprland.conf
old mode 100644
new mode 100755
diff --git a/home/config/hypr/hyprpaper.conf b/home/config/hypr/hyprpaper.conf
old mode 100644
new mode 100755
diff --git a/home/config/hypr/input.conf b/home/config/hypr/input.conf
old mode 100644
new mode 100755
diff --git a/home/config/hypr/monitor.conf b/home/config/hypr/monitor.conf
old mode 100644
new mode 100755
index 5fb209c..e0307d2
--- a/home/config/hypr/monitor.conf
+++ b/home/config/hypr/monitor.conf
@@ -1 +1,3 @@
-monitor=HDMI-A-1,2560x1440@164.835999, 0x0, 1
+monitor=desc:ASUSTek COMPUTER INC ASUS VG32VQ1B 0x00002271,2560x1440@164.55, 0x0, 1
+monitor=desc:Acer Technologies XV272U V3 7422007E54222, 2560x1440@143.91, -2560x-560, 1, transform, 1
+
diff --git a/home/config/hypr/window.conf b/home/config/hypr/window.conf
old mode 100644
new mode 100755
index 57a9917..a2cb29a
--- a/home/config/hypr/window.conf
+++ b/home/config/hypr/window.conf
@@ -17,10 +17,9 @@ decoration {
         new_optimizations = true
         xray = false
     }
-    drop_shadow = yes
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
+    active_opacity = 0.8
+    inactive_opacity = 0.8
+    fullscreen_opacity = 1.0	
 }
 
 animations {
@@ -43,7 +42,7 @@ dwindle {
 }
 
 master {
-    new_is_master = true
+    new_on_top = true
 }
 
 gestures {
diff --git a/home/config/hypr/windowrule.conf b/home/config/hypr/windowrule.conf
old mode 100644
new mode 100755
index fe24cb6..2d45536
--- a/home/config/hypr/windowrule.conf
+++ b/home/config/hypr/windowrule.conf
@@ -1,3 +1,4 @@
+windowrule = pseudo, fcitx
 windowrule = float, file_progress
 windowrule = float, confirm
 windowrule = float, dialog
diff --git a/home/config/kitty/kitty.conf b/home/config/kitty/kitty.conf
old mode 100644
new mode 100755
diff --git a/home/config/kitty/macchiato.conf b/home/config/kitty/macchiato.conf
old mode 100644
new mode 100755
diff --git a/home/config/mako/config b/home/config/mako/config
old mode 100644
new mode 100755
diff --git a/home/config/neofetch/ascii.txt b/home/config/neofetch/ascii.txt
old mode 100644
new mode 100755
diff --git a/home/config/neofetch/config b/home/config/neofetch/config
old mode 100644
new mode 100755
diff --git a/home/config/nushell/config.nu b/home/config/nushell/config.nu
new file mode 100755
index 0000000..cf363d8
--- /dev/null
+++ b/home/config/nushell/config.nu
@@ -0,0 +1,899 @@
+# Nushell Config File
+#
+# version = "0.100.0"
+
+# For more information on defining custom themes, see
+# https://www.nushell.sh/book/coloring_and_theming.html
+# And here is the theme collection
+# https://github.com/nushell/nu_scripts/tree/main/themes
+let dark_theme = {
+    # color for nushell primitives
+    separator: white
+    leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
+    header: green_bold
+    empty: blue
+    # Closures can be used to choose colors for specific values.
+    # The value (in this case, a bool) is piped into the closure.
+    # eg) {|| if $in { 'light_cyan' } else { 'light_gray' } }
+    bool: light_cyan
+    int: white
+    filesize: cyan
+    duration: white
+    date: purple
+    range: white
+    float: white
+    string: white
+    nothing: white
+    binary: white
+    cell-path: white
+    row_index: green_bold
+    record: white
+    list: white
+    block: white
+    hints: dark_gray
+    search_result: { bg: red fg: white }
+    shape_and: purple_bold
+    shape_binary: purple_bold
+    shape_block: blue_bold
+    shape_bool: light_cyan
+    shape_closure: green_bold
+    shape_custom: green
+    shape_datetime: cyan_bold
+    shape_directory: cyan
+    shape_external: cyan
+    shape_externalarg: green_bold
+    shape_external_resolved: light_yellow_bold
+    shape_filepath: cyan
+    shape_flag: blue_bold
+    shape_float: purple_bold
+    # shapes are used to change the cli syntax highlighting
+    shape_garbage: { fg: white bg: red attr: b }
+    shape_glob_interpolation: cyan_bold
+    shape_globpattern: cyan_bold
+    shape_int: purple_bold
+    shape_internalcall: cyan_bold
+    shape_keyword: cyan_bold
+    shape_list: cyan_bold
+    shape_literal: blue
+    shape_match_pattern: green
+    shape_matching_brackets: { attr: u }
+    shape_nothing: light_cyan
+    shape_operator: yellow
+    shape_or: purple_bold
+    shape_pipe: purple_bold
+    shape_range: yellow_bold
+    shape_record: cyan_bold
+    shape_redirection: purple_bold
+    shape_signature: green_bold
+    shape_string: green
+    shape_string_interpolation: cyan_bold
+    shape_table: blue_bold
+    shape_variable: purple
+    shape_vardecl: purple
+    shape_raw_string: light_purple
+}
+
+let light_theme = {
+    # color for nushell primitives
+    separator: dark_gray
+    leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off
+    header: green_bold
+    empty: blue
+    # Closures can be used to choose colors for specific values.
+    # The value (in this case, a bool) is piped into the closure.
+    # eg) {|| if $in { 'dark_cyan' } else { 'dark_gray' } }
+    bool: dark_cyan
+    int: dark_gray
+    filesize: cyan_bold
+    duration: dark_gray
+    date: purple
+    range: dark_gray
+    float: dark_gray
+    string: dark_gray
+    nothing: dark_gray
+    binary: dark_gray
+    cell-path: dark_gray
+    row_index: green_bold
+    record: dark_gray
+    list: dark_gray
+    block: dark_gray
+    hints: dark_gray
+    search_result: { fg: white bg: red }
+    shape_and: purple_bold
+    shape_binary: purple_bold
+    shape_block: blue_bold
+    shape_bool: light_cyan
+    shape_closure: green_bold
+    shape_custom: green
+    shape_datetime: cyan_bold
+    shape_directory: cyan
+    shape_external: cyan
+    shape_externalarg: green_bold
+    shape_external_resolved: light_purple_bold
+    shape_filepath: cyan
+    shape_flag: blue_bold
+    shape_float: purple_bold
+    # shapes are used to change the cli syntax highlighting
+    shape_garbage: { fg: white bg: red attr: b }
+    shape_glob_interpolation: cyan_bold
+    shape_globpattern: cyan_bold
+    shape_int: purple_bold
+    shape_internalcall: cyan_bold
+    shape_keyword: cyan_bold
+    shape_list: cyan_bold
+    shape_literal: blue
+    shape_match_pattern: green
+    shape_matching_brackets: { attr: u }
+    shape_nothing: light_cyan
+    shape_operator: yellow
+    shape_or: purple_bold
+    shape_pipe: purple_bold
+    shape_range: yellow_bold
+    shape_record: cyan_bold
+    shape_redirection: purple_bold
+    shape_signature: green_bold
+    shape_string: green
+    shape_string_interpolation: cyan_bold
+    shape_table: blue_bold
+    shape_variable: purple
+    shape_vardecl: purple
+    shape_raw_string: light_purple
+}
+
+# External completer example
+# let carapace_completer = {|spans|
+#     carapace $spans.0 nushell ...$spans | from json
+# }
+
+# The default config record. This is where much of your global configuration is setup.
+$env.config = {
+    show_banner: false # true or false to enable or disable the welcome banner at startup
+
+    ls: {
+        use_ls_colors: true # use the LS_COLORS environment variable to colorize output
+        clickable_links: true # enable or disable clickable links. Your terminal has to support links.
+    }
+
+    rm: {
+        always_trash: false # always act as if -t was given. Can be overridden with -p
+    }
+
+    table: {
+        mode: rounded # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other
+        index_mode: always # "always" show indexes, "never" show indexes, "auto" = show indexes when a table has "index" column
+        show_empty: true # show 'empty list' and 'empty record' placeholders for command output
+        padding: { left: 1, right: 1 } # a left right padding of each column in a table
+        trim: {
+            methodology: wrapping # wrapping or truncating
+            wrapping_try_keep_words: true # A strategy used by the 'wrapping' methodology
+            truncating_suffix: "..." # A suffix used by the 'truncating' methodology
+        }
+        header_on_separator: false # show header text on separator/border line
+        footer_inheritance: false # render footer in parent table if child is big enough (extended table option)
+        # abbreviated_row_count: 10 # limit data rows from top and bottom after reaching a set point
+    }
+
+    error_style: "fancy" # "fancy" or "plain" for screen reader-friendly error messages
+
+    # Whether an error message should be printed if an error of a certain kind is triggered.
+    display_errors: {
+        exit_code: false # assume the external command prints an error message
+        # Core dump errors are always printed, and SIGPIPE never triggers an error.
+        # The setting below controls message printing for termination by all other signals.
+        termination_signal: true
+    }
+
+    # datetime_format determines what a datetime rendered in the shell would look like.
+    # Behavior without this configuration point will be to "humanize" the datetime display,
+    # showing something like "a day ago."
+    datetime_format: {
+        # normal: '%a, %d %b %Y %H:%M:%S %z'    # shows up in displays of variables or other datetime's outside of tables
+        # table: '%m/%d/%y %I:%M:%S%p'          # generally shows up in tabular outputs such as ls. commenting this out will change it to the default human readable datetime format
+    }
+
+    explore: {
+        status_bar_background: { fg: "#1D1F21", bg: "#C4C9C6" },
+        command_bar_text: { fg: "#C4C9C6" },
+        highlight: { fg: "black", bg: "yellow" },
+        status: {
+            error: { fg: "white", bg: "red" },
+            warn: {}
+            info: {}
+        },
+        selected_cell: { bg: light_blue },
+    }
+
+    history: {
+        max_size: 100_000 # Session has to be reloaded for this to take effect
+        sync_on_enter: true # Enable to share history between multiple sessions, else you have to close the session to write history to file
+        file_format: "plaintext" # "sqlite" or "plaintext"
+        isolation: false # only available with sqlite file_format. true enables history isolation, false disables it. true will allow the history to be isolated to the current session using up/down arrows. false will allow the history to be shared across all sessions.
+    }
+
+    completions: {
+        case_sensitive: false # set to true to enable case-sensitive completions
+        quick: true    # set this to false to prevent auto-selecting completions when only one remains
+        partial: true    # set this to false to prevent partial filling of the prompt
+        algorithm: "prefix"    # prefix or fuzzy
+        sort: "smart" # "smart" (alphabetical for prefix matching, fuzzy score for fuzzy matching) or "alphabetical"
+        external: {
+            enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up may be very slow
+            max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options
+            completer: null # check 'carapace_completer' above as an example
+        }
+        use_ls_colors: true # set this to true to enable file/path/directory completions using LS_COLORS
+    }
+
+    filesize: {
+        metric: false # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
+        format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto
+    }
+
+    cursor_shape: {
+        emacs: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (line is the default)
+        vi_insert: block # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (block is the default)
+        vi_normal: underscore # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (underscore is the default)
+    }
+
+    color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record
+    footer_mode: 25 # always, never, number_of_rows, auto
+    float_precision: 2 # the precision for displaying floats in tables
+    buffer_editor: null # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.VISUAL and $env.EDITOR
+    use_ansi_coloring: true
+    bracketed_paste: true # enable bracketed paste, currently useless on windows
+    edit_mode: emacs # emacs, vi
+    shell_integration: {
+        # osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title
+        osc2: true
+        # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory
+        osc7: true
+        # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8
+        osc8: true
+        # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal
+        osc9_9: false
+        # osc133 is several escapes invented by Final Term which include the supported ones below.
+        # 133;A - Mark prompt start
+        # 133;B - Mark prompt end
+        # 133;C - Mark pre-execution
+        # 133;D;exit - Mark execution finished with exit code
+        # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is
+        osc133: true
+        # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features
+        # 633;A - Mark prompt start
+        # 633;B - Mark prompt end
+        # 633;C - Mark pre-execution
+        # 633;D;exit - Mark execution finished with exit code
+        # 633;E - Explicitly set the command line with an optional nonce
+        # 633;P;Cwd=<path> - Mark the current working directory and communicate it to the terminal
+        # and also helps with the run recent menu in vscode
+        osc633: true
+        # reset_application_mode is escape \x1b[?1l and was added to help ssh work better
+        reset_application_mode: true
+    }
+    render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt.
+    use_kitty_protocol: false # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this.
+    highlight_resolved_externals: false # true enables highlighting of external commands in the repl resolved by which.
+    recursion_limit: 50 # the maximum number of times nushell allows recursion before stopping it
+
+    plugins: {} # Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#configuration.
+
+    plugin_gc: {
+        # Configuration for plugin garbage collection
+        default: {
+            enabled: true # true to enable stopping of inactive plugins
+            stop_after: 10sec # how long to wait after a plugin is inactive to stop it
+        }
+        plugins: {
+            # alternate configuration for specific plugins, by name, for example:
+            #
+            # gstat: {
+            #     enabled: false
+            # }
+        }
+    }
+
+    hooks: {
+        pre_prompt: [{ null }] # run before the prompt is shown
+        pre_execution: [{ null }] # run before the repl input is run
+        env_change: {
+            PWD: [{|before, after| null }] # run if the PWD environment is different since the last repl input
+        }
+        display_output: "if (term size).columns >= 100 { table -e } else { table }" # run to display the output of a pipeline
+        command_not_found: { null } # return an error message when a command is not found
+    }
+
+    menus: [
+        # Configuration for default nushell menus
+        # Note the lack of source parameter
+        {
+            name: completion_menu
+            only_buffer_difference: false
+            marker: "| "
+            type: {
+                layout: columnar
+                columns: 4
+                col_width: 20     # Optional value. If missing all the screen width is used to calculate column width
+                col_padding: 2
+            }
+            style: {
+                text: green
+                selected_text: { attr: r }
+                description_text: yellow
+                match_text: { attr: u }
+                selected_match_text: { attr: ur }
+            }
+        }
+        {
+            name: ide_completion_menu
+            only_buffer_difference: false
+            marker: "| "
+            type: {
+                layout: ide
+                min_completion_width: 0,
+                max_completion_width: 50,
+                max_completion_height: 10, # will be limited by the available lines in the terminal
+                padding: 0,
+                border: true,
+                cursor_offset: 0,
+                description_mode: "prefer_right"
+                min_description_width: 0
+                max_description_width: 50
+                max_description_height: 10
+                description_offset: 1
+                # If true, the cursor pos will be corrected, so the suggestions match up with the typed text
+                #
+                # C:\> str
+                #      str join
+                #      str trim
+                #      str split
+                correct_cursor_pos: false
+            }
+            style: {
+                text: green
+                selected_text: { attr: r }
+                description_text: yellow
+                match_text: { attr: u }
+                selected_match_text: { attr: ur }
+            }
+        }
+        {
+            name: history_menu
+            only_buffer_difference: true
+            marker: "? "
+            type: {
+                layout: list
+                page_size: 10
+            }
+            style: {
+                text: green
+                selected_text: green_reverse
+                description_text: yellow
+            }
+        }
+        {
+            name: help_menu
+            only_buffer_difference: true
+            marker: "? "
+            type: {
+                layout: description
+                columns: 4
+                col_width: 20     # Optional value. If missing all the screen width is used to calculate column width
+                col_padding: 2
+                selection_rows: 4
+                description_rows: 10
+            }
+            style: {
+                text: green
+                selected_text: green_reverse
+                description_text: yellow
+            }
+        }
+    ]
+
+    keybindings: [
+        {
+            name: completion_menu
+            modifier: none
+            keycode: tab
+            mode: [emacs vi_normal vi_insert]
+            event: {
+                until: [
+                    { send: menu name: completion_menu }
+                    { send: menunext }
+                    { edit: complete }
+                ]
+            }
+        }
+        {
+            name: completion_previous_menu
+            modifier: shift
+            keycode: backtab
+            mode: [emacs, vi_normal, vi_insert]
+            event: { send: menuprevious }
+        }
+        {
+            name: ide_completion_menu
+            modifier: control
+            keycode: space
+            mode: [emacs vi_normal vi_insert]
+            event: {
+                until: [
+                    { send: menu name: ide_completion_menu }
+                    { send: menunext }
+                    { edit: complete }
+                ]
+            }
+        }
+        {
+            name: history_menu
+            modifier: control
+            keycode: char_r
+            mode: [emacs, vi_insert, vi_normal]
+            event: { send: menu name: history_menu }
+        }
+        {
+            name: help_menu
+            modifier: none
+            keycode: f1
+            mode: [emacs, vi_insert, vi_normal]
+            event: { send: menu name: help_menu }
+        }
+        {
+            name: next_page_menu
+            modifier: control
+            keycode: char_x
+            mode: emacs
+            event: { send: menupagenext }
+        }
+        {
+            name: undo_or_previous_page_menu
+            modifier: control
+            keycode: char_z
+            mode: emacs
+            event: {
+                until: [
+                    { send: menupageprevious }
+                    { edit: undo }
+                ]
+            }
+        }
+        {
+            name: escape
+            modifier: none
+            keycode: escape
+            mode: [emacs, vi_normal, vi_insert]
+            event: { send: esc }    # NOTE: does not appear to work
+        }
+        {
+            name: cancel_command
+            modifier: control
+            keycode: char_c
+            mode: [emacs, vi_normal, vi_insert]
+            event: { send: ctrlc }
+        }
+        {
+            name: quit_shell
+            modifier: control
+            keycode: char_d
+            mode: [emacs, vi_normal, vi_insert]
+            event: { send: ctrld }
+        }
+        {
+            name: clear_screen
+            modifier: control
+            keycode: char_l
+            mode: [emacs, vi_normal, vi_insert]
+            event: { send: clearscreen }
+        }
+        {
+            name: search_history
+            modifier: control
+            keycode: char_q
+            mode: [emacs, vi_normal, vi_insert]
+            event: { send: searchhistory }
+        }
+        {
+            name: open_command_editor
+            modifier: control
+            keycode: char_o
+            mode: [emacs, vi_normal, vi_insert]
+            event: { send: openeditor }
+        }
+        {
+            name: move_up
+            modifier: none
+            keycode: up
+            mode: [emacs, vi_normal, vi_insert]
+            event: {
+                until: [
+                    { send: menuup }
+                    { send: up }
+                ]
+            }
+        }
+        {
+            name: move_down
+            modifier: none
+            keycode: down
+            mode: [emacs, vi_normal, vi_insert]
+            event: {
+                until: [
+                    { send: menudown }
+                    { send: down }
+                ]
+            }
+        }
+        {
+            name: move_left
+            modifier: none
+            keycode: left
+            mode: [emacs, vi_normal, vi_insert]
+            event: {
+                until: [
+                    { send: menuleft }
+                    { send: left }
+                ]
+            }
+        }
+        {
+            name: move_right_or_take_history_hint
+            modifier: none
+            keycode: right
+            mode: [emacs, vi_normal, vi_insert]
+            event: {
+                until: [
+                    { send: historyhintcomplete }
+                    { send: menuright }
+                    { send: right }
+                ]
+            }
+        }
+        {
+            name: move_one_word_left
+            modifier: control
+            keycode: left
+            mode: [emacs, vi_normal, vi_insert]
+            event: { edit: movewordleft }
+        }
+        {
+            name: move_one_word_right_or_take_history_hint
+            modifier: control
+            keycode: right
+            mode: [emacs, vi_normal, vi_insert]
+            event: {
+                until: [
+                    { send: historyhintwordcomplete }
+                    { edit: movewordright }
+                ]
+            }
+        }
+        {
+            name: move_to_line_start
+            modifier: none
+            keycode: home
+            mode: [emacs, vi_normal, vi_insert]
+            event: { edit: movetolinestart }
+        }
+        {
+            name: move_to_line_start
+            modifier: control
+            keycode: char_a
+            mode: [emacs, vi_normal, vi_insert]
+            event: { edit: movetolinestart }
+        }
+        {
+            name: move_to_line_end_or_take_history_hint
+            modifier: none
+            keycode: end
+            mode: [emacs, vi_normal, vi_insert]
+            event: {
+                until: [
+                    { send: historyhintcomplete }
+                    { edit: movetolineend }
+                ]
+            }
+        }
+        {
+            name: move_to_line_end_or_take_history_hint
+            modifier: control
+            keycode: char_e
+            mode: [emacs, vi_normal, vi_insert]
+            event: {
+                until: [
+                    { send: historyhintcomplete }
+                    { edit: movetolineend }
+                ]
+            }
+        }
+        {
+            name: move_to_line_start
+            modifier: control
+            keycode: home
+            mode: [emacs, vi_normal, vi_insert]
+            event: { edit: movetolinestart }
+        }
+        {
+            name: move_to_line_end
+            modifier: control
+            keycode: end
+            mode: [emacs, vi_normal, vi_insert]
+            event: { edit: movetolineend }
+        }
+        {
+            name: move_down
+            modifier: control
+            keycode: char_n
+            mode: [emacs, vi_normal, vi_insert]
+            event: {
+                until: [
+                    { send: menudown }
+                    { send: down }
+                ]
+            }
+        }
+        {
+            name: move_up
+            modifier: control
+            keycode: char_p
+            mode: [emacs, vi_normal, vi_insert]
+            event: {
+                until: [
+                    { send: menuup }
+                    { send: up }
+                ]
+            }
+        }
+        {
+            name: delete_one_character_backward
+            modifier: none
+            keycode: backspace
+            mode: [emacs, vi_insert]
+            event: { edit: backspace }
+        }
+        {
+            name: delete_one_word_backward
+            modifier: control
+            keycode: backspace
+            mode: [emacs, vi_insert]
+            event: { edit: backspaceword }
+        }
+        {
+            name: delete_one_character_forward
+            modifier: none
+            keycode: delete
+            mode: [emacs, vi_insert]
+            event: { edit: delete }
+        }
+        {
+            name: delete_one_character_forward
+            modifier: control
+            keycode: delete
+            mode: [emacs, vi_insert]
+            event: { edit: delete }
+        }
+        {
+            name: delete_one_character_backward
+            modifier: control
+            keycode: char_h
+            mode: [emacs, vi_insert]
+            event: { edit: backspace }
+        }
+        {
+            name: delete_one_word_backward
+            modifier: control
+            keycode: char_w
+            mode: [emacs, vi_insert]
+            event: { edit: backspaceword }
+        }
+        {
+            name: move_left
+            modifier: none
+            keycode: backspace
+            mode: vi_normal
+            event: { edit: moveleft }
+        }
+        {
+            name: newline_or_run_command
+            modifier: none
+            keycode: enter
+            mode: emacs
+            event: { send: enter }
+        }
+        {
+            name: move_left
+            modifier: control
+            keycode: char_b
+            mode: emacs
+            event: {
+                until: [
+                    { send: menuleft }
+                    { send: left }
+                ]
+            }
+        }
+        {
+            name: move_right_or_take_history_hint
+            modifier: control
+            keycode: char_f
+            mode: emacs
+            event: {
+                until: [
+                    { send: historyhintcomplete }
+                    { send: menuright }
+                    { send: right }
+                ]
+            }
+        }
+        {
+            name: redo_change
+            modifier: control
+            keycode: char_g
+            mode: emacs
+            event: { edit: redo }
+        }
+        {
+            name: undo_change
+            modifier: control
+            keycode: char_z
+            mode: emacs
+            event: { edit: undo }
+        }
+        {
+            name: paste_before
+            modifier: control
+            keycode: char_y
+            mode: emacs
+            event: { edit: pastecutbufferbefore }
+        }
+        {
+            name: cut_word_left
+            modifier: control
+            keycode: char_w
+            mode: emacs
+            event: { edit: cutwordleft }
+        }
+        {
+            name: cut_line_to_end
+            modifier: control
+            keycode: char_k
+            mode: emacs
+            event: { edit: cuttolineend }
+        }
+        {
+            name: cut_line_from_start
+            modifier: control
+            keycode: char_u
+            mode: emacs
+            event: { edit: cutfromstart }
+        }
+        {
+            name: swap_graphemes
+            modifier: control
+            keycode: char_t
+            mode: emacs
+            event: { edit: swapgraphemes }
+        }
+        {
+            name: move_one_word_left
+            modifier: alt
+            keycode: left
+            mode: emacs
+            event: { edit: movewordleft }
+        }
+        {
+            name: move_one_word_right_or_take_history_hint
+            modifier: alt
+            keycode: right
+            mode: emacs
+            event: {
+                until: [
+                    { send: historyhintwordcomplete }
+                    { edit: movewordright }
+                ]
+            }
+        }
+        {
+            name: move_one_word_left
+            modifier: alt
+            keycode: char_b
+            mode: emacs
+            event: { edit: movewordleft }
+        }
+        {
+            name: move_one_word_right_or_take_history_hint
+            modifier: alt
+            keycode: char_f
+            mode: emacs
+            event: {
+                until: [
+                    { send: historyhintwordcomplete }
+                    { edit: movewordright }
+                ]
+            }
+        }
+        {
+            name: delete_one_word_forward
+            modifier: alt
+            keycode: delete
+            mode: emacs
+            event: { edit: deleteword }
+        }
+        {
+            name: delete_one_word_backward
+            modifier: alt
+            keycode: backspace
+            mode: emacs
+            event: { edit: backspaceword }
+        }
+        {
+            name: delete_one_word_backward
+            modifier: alt
+            keycode: char_m
+            mode: emacs
+            event: { edit: backspaceword }
+        }
+        {
+            name: cut_word_to_right
+            modifier: alt
+            keycode: char_d
+            mode: emacs
+            event: { edit: cutwordright }
+        }
+        {
+            name: upper_case_word
+            modifier: alt
+            keycode: char_u
+            mode: emacs
+            event: { edit: uppercaseword }
+        }
+        {
+            name: lower_case_word
+            modifier: alt
+            keycode: char_l
+            mode: emacs
+            event: { edit: lowercaseword }
+        }
+        {
+            name: capitalize_char
+            modifier: alt
+            keycode: char_c
+            mode: emacs
+            event: { edit: capitalizechar }
+        }
+        # The following bindings with `*system` events require that Nushell has
+        # been compiled with the `system-clipboard` feature.
+        # If you want to use the system clipboard for visual selection or to
+        # paste directly, uncomment the respective lines and replace the version
+        # using the internal clipboard.
+        {
+            name: copy_selection
+            modifier: control_shift
+            keycode: char_c
+            mode: emacs
+            event: { edit: copyselection }
+            # event: { edit: copyselectionsystem }
+        }
+        {
+            name: cut_selection
+            modifier: control_shift
+            keycode: char_x
+            mode: emacs
+            event: { edit: cutselection }
+            # event: { edit: cutselectionsystem }
+        }
+        # {
+        #     name: paste_system
+        #     modifier: control_shift
+        #     keycode: char_v
+        #     mode: emacs
+        #     event: { edit: pastesystem }
+        # }
+        {
+            name: select_all
+            modifier: control_shift
+            keycode: char_a
+            mode: emacs
+            event: { edit: selectall }
+        }
+    ]
+}
diff --git a/home/config/nushell/env.nu b/home/config/nushell/env.nu
new file mode 100755
index 0000000..ce12dc7
--- /dev/null
+++ b/home/config/nushell/env.nu
@@ -0,0 +1,101 @@
+# Nushell Environment Config File
+#
+# version = "0.100.0"
+
+def create_left_prompt [] {
+    let dir = match (do --ignore-shell-errors { $env.PWD | path relative-to $nu.home-path }) {
+        null => $env.PWD
+        '' => '~'
+        $relative_pwd => ([~ $relative_pwd] | path join)
+    }
+
+    let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
+    let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
+    let path_segment = $"($path_color)($dir)(ansi reset)"
+
+    $path_segment | str replace --all (char path_sep) $"($separator_color)(char path_sep)($path_color)"
+}
+
+def create_right_prompt [] {
+    # create a right prompt in magenta with green separators and am/pm underlined
+    let time_segment = ([
+        (ansi reset)
+        (ansi magenta)
+        (date now | format date '%x %X') # try to respect user's locale
+    ] | str join | str replace --regex --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
+        str replace --regex --all "([AP]M)" $"(ansi magenta_underline)${1}")
+
+    let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
+        (ansi rb)
+        ($env.LAST_EXIT_CODE)
+    ] | str join)
+    } else { "" }
+
+    ([$last_exit_code, (char space), $time_segment] | str join)
+}
+
+# Use nushell functions to define your right and left prompt
+$env.PROMPT_COMMAND = {|| create_left_prompt }
+# FIXME: This default is not implemented in rust code as of 2023-09-08.
+$env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
+
+# The prompt indicators are environmental variables that represent
+# the state of the prompt
+$env.PROMPT_INDICATOR = {|| "> " }
+$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " }
+$env.PROMPT_INDICATOR_VI_NORMAL = {|| "> " }
+$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " }
+
+# If you want previously entered commands to have a different prompt from the usual one,
+# you can uncomment one or more of the following lines.
+# This can be useful if you have a 2-line prompt and it's taking up a lot of space
+# because every command entered takes up 2 lines instead of 1. You can then uncomment
+# the line below so that previously entered commands show with a single `🚀`.
+# $env.TRANSIENT_PROMPT_COMMAND = {|| "🚀 " }
+# $env.TRANSIENT_PROMPT_INDICATOR = {|| "" }
+# $env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = {|| "" }
+# $env.TRANSIENT_PROMPT_INDICATOR_VI_NORMAL = {|| "" }
+# $env.TRANSIENT_PROMPT_MULTILINE_INDICATOR = {|| "" }
+# $env.TRANSIENT_PROMPT_COMMAND_RIGHT = {|| "" }
+
+# Specifies how environment variables are:
+# - converted from a string to a value on Nushell startup (from_string)
+# - converted from a value back to a string when running external commands (to_string)
+# Note: The conversions happen *after* config.nu is loaded
+$env.ENV_CONVERSIONS = {
+    "PATH": {
+        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+    }
+    "Path": {
+        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+    }
+}
+
+# Directories to search for scripts when calling source or use
+# The default for this is $nu.default-config-dir/scripts
+$env.NU_LIB_DIRS = [
+    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
+    ($nu.data-dir | path join 'completions') # default home for nushell completions
+]
+
+# Directories to search for plugin binaries when calling register
+# The default for this is $nu.default-config-dir/plugins
+$env.NU_PLUGIN_DIRS = [
+    ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
+]
+
+# To add entries to PATH (on Windows you might use Path), you can use the following pattern:
+# $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path')
+# An alternate way to add entries to $env.PATH is to use the custom command `path add`
+# which is built into the nushell stdlib:
+# use std "path add"
+# $env.PATH = ($env.PATH | split row (char esep))
+# path add /some/path
+# path add ($env.CARGO_HOME | path join "bin")
+# path add ($env.HOME | path join ".local" "bin")
+# $env.PATH = ($env.PATH | uniq)
+
+# To load from a custom file you can use:
+# source ($nu.default-config-dir | path join 'custom.nu')
diff --git a/home/config/nushell/history.txt b/home/config/nushell/history.txt
new file mode 100755
index 0000000..cfce07b
--- /dev/null
+++ b/home/config/nushell/history.txt
@@ -0,0 +1,3 @@
+cd ~/.conig
+ls
+exit
diff --git a/home/config/nvim/.gitignore b/home/config/nvim/.gitignore
old mode 100644
new mode 100755
diff --git a/home/config/nvim/.neoconf.json b/home/config/nvim/.neoconf.json
old mode 100644
new mode 100755
diff --git a/home/config/nvim/coc-settings.json b/home/config/nvim/coc-settings.json
old mode 100644
new mode 100755
diff --git a/home/config/nvim/init.lua b/home/config/nvim/init.lua
old mode 100644
new mode 100755
index 2514f9e..d7fc794
--- a/home/config/nvim/init.lua
+++ b/home/config/nvim/init.lua
@@ -1,2 +1 @@
--- bootstrap lazy.nvim, LazyVim and your plugins
-require("config.lazy")
+require("config/lazy");
diff --git a/home/config/nvim/lua/config/autocmds.lua b/home/config/nvim/lua/config/autocmds.lua
old mode 100644
new mode 100755
diff --git a/home/config/nvim/lua/config/keymaps.lua b/home/config/nvim/lua/config/keymaps.lua
old mode 100644
new mode 100755
diff --git a/home/config/nvim/lua/config/lazy.lua b/home/config/nvim/lua/config/lazy.lua
old mode 100644
new mode 100755
index 234ae6b..1720aff
--- a/home/config/nvim/lua/config/lazy.lua
+++ b/home/config/nvim/lua/config/lazy.lua
@@ -46,7 +46,14 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.util.project" },
     { import = "lazyvim.plugins.extras.vscode" },
     -- import/override with your plugins
-    { import = "plugins" },
+    { import = "plugins", {
+      rocks = {enabled = false},
+      dev = {
+          path = "~/.local/share/nvim/nix",
+        fallback = false,
+        }
+      }
+    },
   },
   defaults = {
     -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
diff --git a/home/config/nvim/lua/config/options.lua b/home/config/nvim/lua/config/options.lua
old mode 100644
new mode 100755
diff --git a/home/config/nvim/lua/plugins/coc.lua b/home/config/nvim/lua/plugins/coc.lua
old mode 100644
new mode 100755
diff --git a/home/config/nvim/lua/plugins/colorscheme.lua b/home/config/nvim/lua/plugins/colorscheme.lua
old mode 100644
new mode 100755
diff --git a/home/config/nvim/lua/plugins/lsp.lua b/home/config/nvim/lua/plugins/lsp.lua
old mode 100644
new mode 100755
diff --git a/home/config/nvim/lua/plugins/notify.lua b/home/config/nvim/lua/plugins/notify.lua
old mode 100644
new mode 100755
diff --git a/home/config/nvim/lua/plugins/nvim-ufo.lua b/home/config/nvim/lua/plugins/nvim-ufo.lua
old mode 100644
new mode 100755
diff --git a/home/config/nvim/lua/plugins/treesitter.lua b/home/config/nvim/lua/plugins/treesitter.lua
new file mode 100755
index 0000000..aa7badf
--- /dev/null
+++ b/home/config/nvim/lua/plugins/treesitter.lua
@@ -0,0 +1,23 @@
+return {
+    'nvim-treesitter/nvim-treesitter',
+    event = { "BufReadPost", "BufNewFile" },
+    main = "nvim-treesitter.configs",
+    dev = true,
+    opts = {
+        highlight = {
+            -- `false` will disable the whole extension
+            enable = true,
+            additional_vim_regex_highlighting = false,
+        },
+        incremental_selection = {
+            enable = true,
+            keymaps = {
+                init_selection = "<CR>",
+                node_incremental = "<CR>",
+                scope_incremental = "<S-CR>",
+                node_decremental = "<BS>",
+            },
+        },
+    }
+
+}
diff --git a/home/config/nvim/lua/plugins/venv-selector.lua b/home/config/nvim/lua/plugins/venv-selector.lua
old mode 100644
new mode 100755
diff --git a/home/config/nvim/stylua.toml b/home/config/nvim/stylua.toml
old mode 100644
new mode 100755
diff --git a/home/config/starship/frappe.toml b/home/config/starship/frappe.toml
new file mode 100755
index 0000000..11ef6a3
--- /dev/null
+++ b/home/config/starship/frappe.toml
@@ -0,0 +1,27 @@
+[palettes.catppuccin_frappe]
+rosewater = "#f2d5cf"
+flamingo = "#eebebe"
+pink = "#f4b8e4"
+mauve = "#ca9ee6"
+red = "#e78284"
+maroon = "#ea999c"
+peach = "#ef9f76"
+yellow = "#e5c890"
+green = "#a6d189"
+teal = "#81c8be"
+sky = "#99d1db"
+sapphire = "#85c1dc"
+blue = "#8caaee"
+lavender = "#babbf1"
+text = "#c6d0f5"
+subtext1 = "#b5bfe2"
+subtext0 = "#a5adce"
+overlay2 = "#949cbb"
+overlay1 = "#838ba7"
+overlay0 = "#737994"
+surface2 = "#626880"
+surface1 = "#51576d"
+surface0 = "#414559"
+base = "#303446"
+mantle = "#292c3c"
+crust = "#232634"
diff --git a/home/config/starship/latte.toml b/home/config/starship/latte.toml
new file mode 100755
index 0000000..119d45c
--- /dev/null
+++ b/home/config/starship/latte.toml
@@ -0,0 +1,27 @@
+[palettes.catppuccin_latte]
+rosewater = "#dc8a78"
+flamingo = "#dd7878"
+pink = "#ea76cb"
+mauve = "#8839ef"
+red = "#d20f39"
+maroon = "#e64553"
+peach = "#fe640b"
+yellow = "#df8e1d"
+green = "#40a02b"
+teal = "#179299"
+sky = "#04a5e5"
+sapphire = "#209fb5"
+blue = "#1e66f5"
+lavender = "#7287fd"
+text = "#4c4f69"
+subtext1 = "#5c5f77"
+subtext0 = "#6c6f85"
+overlay2 = "#7c7f93"
+overlay1 = "#8c8fa1"
+overlay0 = "#9ca0b0"
+surface2 = "#acb0be"
+surface1 = "#bcc0cc"
+surface0 = "#ccd0da"
+base = "#eff1f5"
+mantle = "#e6e9ef"
+crust = "#dce0e8"
diff --git a/home/config/starship/macchiato.toml b/home/config/starship/macchiato.toml
new file mode 100755
index 0000000..648db69
--- /dev/null
+++ b/home/config/starship/macchiato.toml
@@ -0,0 +1,27 @@
+[palettes.catppuccin_macchiato]
+rosewater = "#f4dbd6"
+flamingo = "#f0c6c6"
+pink = "#f5bde6"
+mauve = "#c6a0f6"
+red = "#ed8796"
+maroon = "#ee99a0"
+peach = "#f5a97f"
+yellow = "#eed49f"
+green = "#a6da95"
+teal = "#8bd5ca"
+sky = "#91d7e3"
+sapphire = "#7dc4e4"
+blue = "#8aadf4"
+lavender = "#b7bdf8"
+text = "#cad3f5"
+subtext1 = "#b8c0e0"
+subtext0 = "#a5adcb"
+overlay2 = "#939ab7"
+overlay1 = "#8087a2"
+overlay0 = "#6e738d"
+surface2 = "#5b6078"
+surface1 = "#494d64"
+surface0 = "#363a4f"
+base = "#24273a"
+mantle = "#1e2030"
+crust = "#181926"
diff --git a/home/config/starship/mocha.toml b/home/config/starship/mocha.toml
new file mode 100755
index 0000000..e9b660a
--- /dev/null
+++ b/home/config/starship/mocha.toml
@@ -0,0 +1,27 @@
+[palettes.catppuccin_mocha]
+rosewater = "#f5e0dc"
+flamingo = "#f2cdcd"
+pink = "#f5c2e7"
+mauve = "#cba6f7"
+red = "#f38ba8"
+maroon = "#eba0ac"
+peach = "#fab387"
+yellow = "#f9e2af"
+green = "#a6e3a1"
+teal = "#94e2d5"
+sky = "#89dceb"
+sapphire = "#74c7ec"
+blue = "#89b4fa"
+lavender = "#b4befe"
+text = "#cdd6f4"
+subtext1 = "#bac2de"
+subtext0 = "#a6adc8"
+overlay2 = "#9399b2"
+overlay1 = "#7f849c"
+overlay0 = "#6c7086"
+surface2 = "#585b70"
+surface1 = "#45475a"
+surface0 = "#313244"
+base = "#1e1e2e"
+mantle = "#181825"
+crust = "#11111b"
diff --git a/home/config/starship/starship.toml b/home/config/starship/starship.toml
new file mode 100755
index 0000000..afd0628
--- /dev/null
+++ b/home/config/starship/starship.toml
@@ -0,0 +1,400 @@
+# Get editor completions based on the config schema "$schema" = 'https://starship.rs/config-schema.json'
+# Sets user-defined palette
+# Palettes must be defined _after_ this line
+palette = "catppuccin_macchiato"
+
+# Starship modules
+[character]
+# Note the use of Catppuccin color 'peach'
+success_symbol = "[(green) ❯](peach)"
+error_symbol = "[(red) ❯](peach)"
+vimcmd_symbol = "[ ❮](subtext1)"      # For use with zsh-vi-mode
+
+[git_branch]
+style = "bold mauve"
+symbol = " "
+format = '[$symbol$branch]($style)'
+
+[directory]
+truncation_length = 4
+style = "bold lavender"
+read_only = " 󰌾"
+
+# Palette definitions
+[palettes.catppuccin_latte]
+rosewater = "#dc8a78"
+flamingo = "#dd7878"
+pink = "#ea76cb"
+mauve = "#8839ef"
+red = "#d20f39"
+maroon = "#e64553"
+peach = "#fe640b"
+yellow = "#df8e1d"
+green = "#40a02b"
+teal = "#179299"
+sky = "#04a5e5"
+sapphire = "#209fb5"
+blue = "#1e66f5"
+lavender = "#7287fd"
+text = "#4c4f69"
+subtext1 = "#5c5f77"
+subtext0 = "#6c6f85"
+overlay2 = "#7c7f93"
+overlay1 = "#8c8fa1"
+overlay0 = "#9ca0b0"
+surface2 = "#acb0be"
+surface1 = "#bcc0cc"
+surface0 = "#ccd0da"
+base = "#eff1f5"
+mantle = "#e6e9ef"
+crust = "#dce0e8"
+
+[palettes.catppuccin_frappe]
+rosewater = "#f2d5cf"
+flamingo = "#eebebe"
+pink = "#f4b8e4"
+mauve = "#ca9ee6"
+red = "#e78284"
+maroon = "#ea999c"
+peach = "#ef9f76"
+yellow = "#e5c890"
+green = "#a6d189"
+teal = "#81c8be"
+sky = "#99d1db"
+sapphire = "#85c1dc"
+blue = "#8caaee"
+lavender = "#babbf1"
+text = "#c6d0f5"
+subtext1 = "#b5bfe2"
+subtext0 = "#a5adce"
+overlay2 = "#949cbb"
+overlay1 = "#838ba7"
+overlay0 = "#737994"
+surface2 = "#626880"
+surface1 = "#51576d"
+surface0 = "#414559"
+base = "#303446"
+mantle = "#292c3c"
+crust = "#232634"
+
+[palettes.catppuccin_macchiato]
+rosewater = "#f4dbd6"
+flamingo = "#f0c6c6"
+pink = "#f5bde6"
+mauve = "#c6a0f6"
+red = "#ed8796"
+maroon = "#ee99a0"
+peach = "#f5a97f"
+yellow = "#eed49f"
+green = "#a6da95"
+teal = "#8bd5ca"
+sky = "#91d7e3"
+sapphire = "#7dc4e4"
+blue = "#8aadf4"
+lavender = "#b7bdf8"
+text = "#cad3f5"
+subtext1 = "#b8c0e0"
+subtext0 = "#a5adcb"
+overlay2 = "#939ab7"
+overlay1 = "#8087a2"
+overlay0 = "#6e738d"
+surface2 = "#5b6078"
+surface1 = "#494d64"
+surface0 = "#363a4f"
+base = "#24273a"
+mantle = "#1e2030"
+crust = "#181926"
+
+[palettes.catppuccin_mocha]
+rosewater = "#f5e0dc"
+flamingo = "#f2cdcd"
+pink = "#f5c2e7"
+mauve = "#cba6f7"
+red = "#f38ba8"
+maroon = "#eba0ac"
+peach = "#fab387"
+yellow = "#f9e2af"
+green = "#a6e3a1"
+teal = "#94e2d5"
+sky = "#89dceb"
+sapphire = "#74c7ec"
+blue = "#89b4fa"
+lavender = "#b4befe"
+text = "#cdd6f4"
+subtext1 = "#bac2de"
+subtext0 = "#a6adc8"
+overlay2 = "#9399b2"
+overlay1 = "#7f849c"
+overlay0 = "#6c7086"
+surface2 = "#585b70"
+surface1 = "#45475a"
+surface0 = "#313244"
+base = "#1e1e2e"
+mantle = "#181825"
+crust = "#11111b"
+
+[aws]
+symbol = "  "
+format = ' [$symbol($profile)(\($region\))(\[$duration\])]($style)'
+
+[bun]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[c]
+symbol = " "
+format = ' [$symbol($version(-$name))]($style)'
+
+[conda]
+symbol = " "
+format = ' [$symbol$environment]($style)'
+
+[crystal]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[dart]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[docker_context]
+symbol = " "
+format = ' [$symbol($version)(🎯 $tfm)]($style)'
+
+[elixir]
+symbol = " "
+format = ' [$symbol($version \(OTP $otp_version\))]($style)'
+
+[elm]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[fennel]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[fossil_branch]
+symbol = " "
+format = ' [$symbol$branch]($style)'
+
+[git_commit]
+tag_symbol = '  '
+
+[git_status]
+# format = '  ([\[$all_status$ahead_behind\]]($style)) '
+format = " ([$ahead_behind$staged$modified$untracked$renamed$deleted$conflicted$stashed]($style)) "
+conflicted = "[◪◦](italic bright-magenta)"
+ahead = "[▴│[${count}](bold white)│](italic green)"
+behind = "[▿│[${count}](bold white)│](italic red)"
+diverged = "[◇ ▴┤[${ahead_count}](regular white)│▿┤[${behind_count}](regular white)│](italic bright-magenta)"
+untracked = "[◌◦](italic bright-yellow)"
+stashed = "[◃◈](italic white)"
+modified = "[●◦](italic yellow)"
+staged = "[▪┤[$count](bold white)│](italic bright-cyan)"
+renamed = "[◎◦](italic bright-blue)"
+deleted = "[✕](italic red)"
+
+[golang]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[guix_shell]
+symbol = " "
+format = ' [$symbol]($style)'
+
+[haskell]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[helm]
+format = ' [$symbol($version)]($style)'
+
+[haxe]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[hg_branch]
+symbol = " "
+format = ' [$symbol$branch]($style)'
+
+[hostname]
+ssh_symbol = " "
+
+[java]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[julia]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[kotlin]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[kubernetes]
+format = ' [$symbol$context( \($namespace\))]($style)'
+
+[lua]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[memory_usage]
+symbol = "󰍛 "
+format = ' $symbol[$ram( | $swap)]($style)'
+
+[meson]
+symbol = "󰔷 "
+format = ' [$symbol$project]($style)'
+
+[nim]
+symbol = "󰆥 "
+format = ' [$symbol($version)]($style)'
+
+[nix_shell]
+symbol = " "
+format = ' [$symbol$state( \($name\))]($style)'
+
+[nodejs]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[ocaml]
+symbol = " "
+format = ' [$symbol($version)(\($switch_indicator$switch_name\))]($style)'
+
+
+[os.symbols]
+Alpaquita = " "
+Alpine = " "
+AlmaLinux = " "
+Amazon = " "
+Android = " "
+Arch = " "
+Artix = " "
+CentOS = " "
+Debian = " "
+DragonFly = " "
+Emscripten = " "
+EndeavourOS = " "
+Fedora = " "
+FreeBSD = " "
+Garuda = "󰛓 "
+Gentoo = " "
+HardenedBSD = "󰞌 "
+Illumos = "󰈸 "
+Kali = " "
+Linux = " "
+Mabox = " "
+Macos = " "
+Manjaro = " "
+Mariner = " "
+MidnightBSD = " "
+Mint = " "
+NetBSD = " "
+NixOS = " "
+OpenBSD = "󰈺 "
+openSUSE = " "
+OracleLinux = "󰌷 "
+Pop = " "
+Raspbian = " "
+Redhat = " "
+RedHatEnterprise = " "
+RockyLinux = " "
+Redox = "󰀘 "
+Solus = "󰠳 "
+SUSE = " "
+Ubuntu = " "
+Unknown = " "
+Void = " "
+Windows = "󰍲 "
+
+[dotnet]
+format = ' [$symbol($version)(🎯 $tfm)]($style)'
+
+[deno]
+format = ' [$symbol($version)]($style)'
+
+[os]
+format = ' [$symbol]($style)'
+
+[package]
+symbol = "󰏗 "
+format = ' [$symbol$version]($style)'
+
+[cmd_duration]
+format = ' [⏱ $duration]($style)'
+
+[cobol]
+format = ' [$symbol($version)]($style)'
+
+[daml]
+format = ' [$symbol($version)]($style)'
+
+[perl]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[php]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[pijul_channel]
+symbol = " "
+format = ' [$symbol$channel]($style)'
+
+[pulumi]
+format = ' [$symbol$stack]($style)'
+
+[purescript]
+format = ' [$symbol($version)]($style)'
+
+[python]
+symbol = " "
+format = ' [${symbol}${pyenv_prefix}(${version})(\($virtualenv\))]($style)'
+
+[erlang]
+symbol = "󰟔 "
+format = ' [$symbol($version)]($style)'
+
+[ruby]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[rust]
+symbol = "󱘗 "
+format = ' [$symbol($version)]($style)'
+
+[scala]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[spack]
+format = ' [$symbol$environment]($style)'
+
+[sudo]
+format = ' [as $symbol]($style)'
+
+[swift]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[zig]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[gradle]
+symbol = " "
+format = ' [$symbol($version)]($style)'
+
+[time]
+format = ' [$time]($style)'
+
+[username]
+format = ' [$user]($style)'
+
+[vagrant]
+format = ' [$symbol($version)]($style)'
+
+[vlang]
+format = ' [$symbol($version)]($style)'
diff --git a/home/config/swayidle/config b/home/config/swayidle/config
old mode 100644
new mode 100755
diff --git a/home/config/swaylock/config b/home/config/swaylock/config
old mode 100644
new mode 100755
diff --git a/home/config/wallpapers/wall.png b/home/config/wallpapers/wall.png
old mode 100644
new mode 100755
diff --git a/home/config/waybar/config.jsonc b/home/config/waybar/config.jsonc
old mode 100644
new mode 100755
diff --git a/home/config/waybar/style.css b/home/config/waybar/style.css
old mode 100644
new mode 100755
diff --git a/home/config/wlogout/icons/hibernate.png b/home/config/wlogout/icons/hibernate.png
old mode 100644
new mode 100755
diff --git a/home/config/wlogout/icons/lock.png b/home/config/wlogout/icons/lock.png
old mode 100644
new mode 100755
diff --git a/home/config/wlogout/icons/logout.png b/home/config/wlogout/icons/logout.png
old mode 100644
new mode 100755
diff --git a/home/config/wlogout/icons/reboot.png b/home/config/wlogout/icons/reboot.png
old mode 100644
new mode 100755
diff --git a/home/config/wlogout/icons/shutdown.png b/home/config/wlogout/icons/shutdown.png
old mode 100644
new mode 100755
diff --git a/home/config/wlogout/icons/suspend.png b/home/config/wlogout/icons/suspend.png
old mode 100644
new mode 100755
diff --git a/home/config/wlogout/layout b/home/config/wlogout/layout
old mode 100644
new mode 100755
diff --git a/home/config/wlogout/style.css b/home/config/wlogout/style.css
old mode 100644
new mode 100755
diff --git a/home/config/wofi/style.css b/home/config/wofi/style.css
old mode 100644
new mode 100755
diff --git a/home/default.nix b/home/default.nix
index b41d2a1..196c704 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -2,75 +2,19 @@
 
 {
   imports = [ ./user ];
-  # Home Manager needs a bit of information about you and the paths it should
-  # manage.
   home.username = "danny";
   home.homeDirectory = "/home/danny";
 
-  # This value determines the Home Manager release that your configuration is
-  # compatible with. This helps avoid breakage when a new Home Manager release
-  # introduces backwards incompatible changes.
-  #
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
-  home.stateVersion = "24.11"; # Please read the comment before changing.
+  home.stateVersion = "24.11";
 
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
   home.packages = [
-    pkgs.firefox
-    # # Adds the 'hello' command to your environment. It prints a friendly
-    # # "Hello, world!" when run.
-    # pkgs.hello
-
-    # # It is sometimes useful to fine-tune packages, for example, by applying
-    # # overrides. You can do that directly here, just don't forget the
-    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
-    # # fonts?
-    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
-
-    # # You can also create simple shell scripts directly inside your
-    # # configuration. For example, this adds a command 'my-hello' to your
-    # # environment:
-    # (pkgs.writeShellScriptBin "my-hello" ''
-    #   echo "Hello, ${config.home.username}!"
-    # '')
+    pkgs.opera
   ];
 
-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
   home.file = {
-    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
-    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
-    # # symlink to the Nix store copy.
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # # You can also set the file content immediately.
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
   };
 
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/danny/etc/profile.d/hm-session-vars.sh
-  #
   home.sessionVariables = {
-    # EDITOR = "emacs";
   };
 
   # Let Home Manager install and manage itself.
diff --git a/home/user/config.nix b/home/user/config.nix
index 5280d54..b7875a2 100644
--- a/home/user/config.nix
+++ b/home/user/config.nix
@@ -13,5 +13,8 @@ in {
     ".config/btop".source = "${configDir}/btop";
     ".config/wofi".source = "${configDir}/wofi";
     ".config/mako".source = "${configDir}/mako";
+    # ".config/starship.toml".source = "${configDir}/starship/starship.toml";
+    ".config/macchiato.toml".source = "${configDir}/starship/macchiato.toml";
+    ".config/nushell".source = "${configDir}/nushell";
   };
 }
diff --git a/home/user/offload b/home/user/offload
new file mode 100755
index 0000000..508320a
--- /dev/null
+++ b/home/user/offload
@@ -0,0 +1,6 @@
+#!/bin/bash
+export __NV_PRIME_RENDER_OFFLOAD=1
+export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
+export __GLX_VENDOR_LIBRARY_NAME=nvidia
+export __VK_LAYER_NV_optimus=NVIDIA_only
+exec "$@"
diff --git a/home/user/packages.nix b/home/user/packages.nix
index b52cf47..ff873cf 100644
--- a/home/user/packages.nix
+++ b/home/user/packages.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:
 
 {
-
   home.packages = [
+    pkgs.vscode
     pkgs.opera
     pkgs.discord
   
@@ -35,7 +35,6 @@
 
     # Utils
     pkgs.viewnior
-    pkgs.hyprshot
     pkgs.catppuccin-cursors.macchiatoBlue
     pkgs.catppuccin-gtk
     # pkgs.papirus-folders
diff --git a/home/user/programs/nvim/default.nix b/home/user/programs/nvim/default.nix
new file mode 100644
index 0000000..8610966
--- /dev/null
+++ b/home/user/programs/nvim/default.nix
@@ -0,0 +1,75 @@
+{ pkgs, ... }:
+let
+
+  treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
+    p.bash
+    p.comment
+    p.css
+    p.dockerfile
+    p.fish
+    p.gitattributes
+    p.gitignore
+    p.go
+    p.gomod
+    p.gowork
+    p.hcl
+    p.javascript
+    p.jq
+    p.json5
+    p.json
+    p.lua
+    p.make
+    p.markdown
+    p.nix
+    p.python
+    p.rust
+    p.toml
+    p.typescript
+    p.vue
+    p.yaml
+  ]));
+
+  treesitter-parsers = pkgs.symlinkJoin {
+    name = "treesitter-parsers";
+    paths = treesitterWithGrammars.dependencies;
+  };
+in
+{
+  home.packages = with pkgs; [
+    ripgrep
+    fd
+    lua-language-server
+    rust-analyzer-unwrapped
+    black
+    gh
+  ];
+
+  programs.neovim = {
+    enable = true;
+    package = pkgs.neovim;
+    vimAlias = true;
+    coc.enable = false;
+    withNodeJs = true;
+
+    plugins = [
+       treesitterWithGrammars
+    ];
+  };
+
+  home.file."./.config/nvim/" = {
+    source = ../../../config/nvim;
+    recursive = true;
+  };
+
+  home.file."./.config/nvim/init.lua".text = ''
+    require("config.lazy")
+    vim.opt.runtimepath:append("${treesitter-parsers}")
+  '';
+
+  # Treesitter is configured as a locally developed module in lazy.nvim
+  # we hardcode a symlink here so that we can refer to it in our lazy config
+  home.file."./.local/share/nvim/nix/nvim-treesitter/" = {
+    recursive = true;
+    source = treesitterWithGrammars;
+  };
+}
diff --git a/home/user/programs/nvim/fx_loader.sh b/home/user/programs/nvim/fx_loader.sh
new file mode 100644
index 0000000..5e1d577
--- /dev/null
+++ b/home/user/programs/nvim/fx_loader.sh
@@ -0,0 +1,10 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p patchelf
+
+# Fixes linking for NixOS
+# ./fx_loader.sh ~/.local/share/nvim/mason/packages/rust-analyzer/rust-analyzer
+for binary in ${@}; do
+  patchelf \
+    --set-interpreter "$(cat ${NIX_CC}/nix-support/dynamic-linker)" \
+    "${binary}"
+done
diff --git a/home/user/shell.nix b/home/user/shell.nix
index 2b9fe82..4d4791d 100644
--- a/home/user/shell.nix
+++ b/home/user/shell.nix
@@ -2,7 +2,6 @@
 let
   myAliases = {
     cat = "bat";
-    ls = "eza --icons=always";
 
     fullClean = ''
       nix-collect-garbage --delete-old
@@ -12,24 +11,35 @@ let
       sudo /run/current-system/bin/switch-to-configuration boot
     '';
     rebuild = "sudo nixos-rebuild switch --flake /etc/nixos/#dn-nix";
+    windows = "sudo bootctl set-oneshot auto-windows";
+    toWindows = "sudo bootctl set-oneshot auto-windows && reboot";
   };
 in {
   programs = {
-    zsh = {
+    nushell = {
       enable = true;
-      autosuggestion.enable = true;
-      syntaxHighlighting.enable = true;
-      initExtra = ''
-        source ~/.p10k.zsh && 
-        eval "$(zoxide init --cmd cd zsh)" && 
-      '';
       shellAliases = myAliases;
-      oh-my-zsh = {
-        enable = true;
-        custom = "$HOME/.oh-my-custom";
-        theme = "powerlevel10k/powerlevel10k";
-        plugins = [ "git" "history" "wd" ];
-      };
+      # configFile.source = ../config/nushell/config.nu;
+      # envFile.source = ../config/nushell/env.nu;
     };
+
+    zsh = {
+       enable = true;
+       shellAliases = myAliases;
+    };
+
+    # carapace.enable = true;
+    # carapace.enableNushellIntegration = true;
+    # starship = { 
+    #    enable = true;
+    #    settings = {
+    #      add_newline = true;
+    #    };
+    # };
+    #
+    # zoxide = {
+    #    enable = true;
+    #    enableNushellIntegration = true;
+    # };
   };
 }
diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix
index 99005c1..c146b18 100644
--- a/system/hardware-configuration.nix
+++ b/system/hardware-configuration.nix
@@ -9,7 +9,8 @@
     ];
 
   boot.initrd.availableKernelModules = [ "vmd" "dm-raid" "xhci_pci" "thunderbolt" "nvme" "usbhid" "uas" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelParams = [];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
diff --git a/system/modules/hardware.nix b/system/modules/hardware.nix
index e5c425e..6992f4c 100644
--- a/system/modules/hardware.nix
+++ b/system/modules/hardware.nix
@@ -1,9 +1,29 @@
 { config, pkgs, ... }:
 
 {
+  services.xserver.videoDrivers = ["nvidia"];
+
   hardware = {
     bluetooth.enable = true;
     graphics.enable = true;
+
+    nvidia.open = false;
     nvidia.modesetting.enable = true;
+
+    nvidia.powerManagement.enable = true;
+    nvidia.powerManagement.finegrained = true;
+
+    nvidia.nvidiaSettings = true;
+    nvidia.dynamicBoost.enable = true;
+    nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
+
+    nvidia.prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
+      };
+      intelBusId = "PCI:0:2:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
   };
 }
diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix
index e0c02dd..93efaac 100644
--- a/system/modules/hyprland.nix
+++ b/system/modules/hyprland.nix
@@ -4,8 +4,10 @@
   programs.hyprland = { enable = true; };
 
   environment.systemPackages = with pkgs; [
+    hyprsunset
     hyprshade
     hyprpaper
+    hyprshot
     kitty
     libnotify
     mako
diff --git a/system/modules/internationalisation.nix b/system/modules/internationalisation.nix
index d701104..5133141 100644
--- a/system/modules/internationalisation.nix
+++ b/system/modules/internationalisation.nix
@@ -16,4 +16,16 @@
   };
 
   i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" ];
+
+  i18n.inputMethod = {
+    enable = true;
+    type = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      rime-data
+      fcitx5-gtk
+      fcitx5-rime
+      fcitx5-chinese-addons
+    ];
+  };
+
 }
diff --git a/system/modules/packages.nix b/system/modules/packages.nix
index 61ac3c3..a7403ea 100644
--- a/system/modules/packages.nix
+++ b/system/modules/packages.nix
@@ -2,32 +2,52 @@
 
 {
   environment.systemPackages = with pkgs; [
+    # Browser
     firefox
     opera
+
+    # Utils
     bat
     btop
     eza
     fzf
+    neofetch
+    ripgrep
+    tldr # Alternative for man
+    wget
+    unzip
+    p7zip 
+    zip
+    glxinfo # OpenGL info
+    pciutils # PCI info
+    xdotool # Keyboard input simulation
+
+    # Dev
     git
     gnumake
     lm_sensors
     libsForQt5.qt5.qtquickcontrols2
     libsForQt5.qt5.qtgraphicaleffects
     libsForQt5.qt5.qtsvg
-    neofetch
-    neovim
-    ripgrep
-    tldr
-    unzip
     openssl
     openssl.dev
-    pkg-config
-    wget
-    xfce.thunar
+    pkg-config # Include Lib
+
+    # Editor
+    neovim
+
+    # Misc
+    xfce.thunar # File manager
+
+    # Portal
     xdg-desktop-portal-gtk
     xdg-desktop-portal-wlr
-    zip
-    zoxide
+
+    # Shell 
+    zoxide # Dir jumper
+    nushell # Shell
+    starship # Shell theme
+    carapace # Autocomplete
   ];
 }
 
diff --git a/system/modules/sound.nix b/system/modules/sound.nix
index 8e36751..c06c806 100644
--- a/system/modules/sound.nix
+++ b/system/modules/sound.nix
@@ -13,5 +13,7 @@
     wireplumber.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [ pamixer pavucontrol ];
+  services.playerctld.enable = true;
+
+  environment.systemPackages = with pkgs; [ pavucontrol playerctl ];
 }