From c751220c33a8fb1b0b7548da030ec4c1680f603d Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 9 Apr 2024 22:56:52 +0200 Subject: [PATCH] mega north --- configuration.nix | 4 +- flake.lock | 18 +- flake.nix | 78 +++++--- home-modules/hyprland/hyprland.nix | 35 ++-- home-modules/kitty.nix | 46 ++--- home-modules/shell/fish.nix | 6 +- home-modules/shell/starship.nix | 221 ++++++++++++++-------- home-modules/vscode.nix | 6 + home-modules/wlogout.nix | 10 +- home.nix | 2 + system-modules/hardware-configuration.nix | 47 +++-- 11 files changed, 287 insertions(+), 186 deletions(-) diff --git a/configuration.nix b/configuration.nix index 4760de9..806acad 100644 --- a/configuration.nix +++ b/configuration.nix @@ -13,7 +13,7 @@ in ./system-modules/hsmw.nix ./system-modules/docker.nix ./system-modules/health_reminder.nix - ./system-modules/davmail.nix + # ./system-modules/davmail.nix ./system-modules/ollama.nix ]; @@ -66,8 +66,6 @@ in # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - ntfs3g - btrfs-progs git git-crypt wget diff --git a/flake.lock b/flake.lock index 235caa1..dce7f63 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1710888565, - "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", + "lastModified": 1712386041, + "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", + "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712168706, - "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=", + "lastModified": 1712588820, + "narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb", + "rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2c9b847..846b2ed 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ enable = true; prime = true; # unfree = if enable then [ - unfree = [ + unfree = [ "nvidia-x11" "nvidia-settings" "nvidia-persistenced" @@ -38,27 +38,36 @@ "zoom-us" "zoom" "vscode-extension-MS-python-vscode-pylance" - ] ++ nvidia.unfree ; + ] ++ nvidia.unfree; inecure-packages = [ "electron-25.9.0" - ]; + ]; }; secrets = import ./secrets/passwords-and-certificates.nix; rice = { - transparency = "0.8"; - colors = rec { - main-fg = "#ffffff"; - main-bg = "#000000"; - bubble-fg = main-fg; - bubble-bg = "#222222"; - bubble-border = "#bbbbbb"; - secondary-fg = main-fg; - secondary-bg = "#111133"; - lines = "#bbbbbb"; - accent = "#ff00ff"; + transparency = "0.9"; + color = rec { + background = "000000"; # #000000 + foreground = "dddddd"; # #dddddd + black = "282B35"; # #282B35 + bright-black = "686A71"; # #686A71 + blue = "9d00ff"; # #9d00ff + bright-blue = "c76eff"; # #c76eff + cyan = "00ddff"; # #00ddff + bright-cyan = "33f9ff"; # #33f9ff + green = "0048ff"; # #0048ff + bright-green = "1166ff"; # #1166ff + magenta = "B21889"; # #B21889 + bright-magenta = "ff75f6"; # #ff75f6 + red = "ff0044"; # #ff0044 + bright-red = "ff4576"; # #ff4576 + white = "939599"; # #939599 + bright-white = "ffffff"; # #ffffff + yellow = "ff4000"; # #ff4000 + bright-yellow = "ff8454"; # #ff8454 }; font = { code = { @@ -74,34 +83,41 @@ in { nixosConfigurations = { - NxXPS = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - ./configuration.nix - ]; - specialArgs = let host = "NxXPS"; in { inherit user host pkgs-unstable allowed secrets rice nvidia; }; - }; - NxNORTH = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - ./configuration.nix - ]; - specialArgs = let host = "NxNORTH"; in { inherit user host pkgs-unstable allowed secrets rice nvidia; }; - }; + NxXPS = + let + host = "NxXPS"; + in + nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + ./configuration.nix + ]; + specialArgs = { inherit user host pkgs-unstable allowed secrets rice nvidia; }; + }; + NxNORTH = + let + host = "NxNORTH"; + in + nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + ./configuration.nix + ]; + specialArgs = { inherit user host pkgs-unstable allowed secrets rice nvidia; }; + }; }; homeConfigurations = { NxXPS = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ ./home.nix ]; - extraSpecialArgs = let host = "NxXPS"; in { inherit system user host allowed secrets pkgs-unstable rice nvidia; }; + extraSpecialArgs = let host = "NxXPS"; in { inherit system user host allowed secrets pkgs-unstable rice nvidia; }; }; NxNORTH = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ ./home.nix ]; - extraSpecialArgs = let host = "NxNORTH"; in { inherit system user host allowed secrets pkgs-unstable rice nvidia; }; + extraSpecialArgs = let host = "NxNORTH"; in { inherit system user host allowed secrets pkgs-unstable rice nvidia; }; }; }; - }; } diff --git a/home-modules/hyprland/hyprland.nix b/home-modules/hyprland/hyprland.nix index 8d7ceb5..87c176b 100644 --- a/home-modules/hyprland/hyprland.nix +++ b/home-modules/hyprland/hyprland.nix @@ -2,9 +2,9 @@ let animation-speed = "2"; transparency = rice.transparency; - gap-size = 20; + gap-size = 10; rounding = 10; - border-width = 2; + border-width = 3; monitors = { xps = { main = { @@ -28,15 +28,15 @@ let scale = "1.0"; }; left = { - name = "HDME-A-3"; + name = "HDMI-A-3"; resolution = "1920x1080"; - position = "0x180"; + position = "0x360"; scale = "1.0"; }; right = { - name = "HDMI-A-3"; + name = "HDMI-A-2"; resolution = "1920x1080"; - position = "4480x80"; + position = "4480x360"; scale = "1.0"; }; }; @@ -110,8 +110,8 @@ in workspace = let d1 = if host == "NxXPS" then monitors.xps.main.name else monitors.north.main.name; - d3 = if host == "NxXPS" then monitors.xps.second.name else monitors.north.left.name; - d2 = if host == "NxXPS" then monitors.xps.main.name else monitors.north.right.name; + d2 = if host == "NxXPS" then monitors.xps.second.name else monitors.north.left.name; + d3 = if host == "NxXPS" then monitors.xps.main.name else monitors.north.right.name; compact = ",gapsin:0,gapsout:0,rounding:0,bordersize:0"; in [ @@ -175,8 +175,10 @@ in gaps_in = builtins.div gap-size 2; gaps_out = gap-size; border_size = border-width; - "col.active_border" = "rgba(888888ff)"; - "col.inactive_border" = "rgba(000000ff)"; + "col.active_border" = "rgba(${rice.color.red}ff)"; + "col.inactive_border" = "rgba(${rice.color.black}ff)"; + + cursor_inactive_timeout = 10; layout = "dwindle"; # layout = "master"; @@ -189,8 +191,8 @@ in shadow_range = "20"; shadow_offset = "0 0"; shadow_render_power = "4"; - "col.shadow" = "rgba(000000ff)"; - "col.shadow_inactive" = "rgba(00000000)"; + "col.shadow" = "rgba(${rice.color.red}ff)"; + "col.shadow_inactive" = "rgba(${rice.color.black}ff)"; active_opacity = "1.0"; inactive_opacity = "1.0"; @@ -204,6 +206,7 @@ in size = "3"; passes = "2"; xray = false; + vibrancy = 0.5; ignore_opacity = true; }; }; @@ -269,19 +272,19 @@ in windowrulev2 = [ "opacity ${transparency},class:^(com.chatterino.*)$" "opacity ${transparency},class:^(chatterino)$" - "bordercolor rgba(ff00ffff) rgba(ff00ff66), pinned:1" + "bordercolor rgba(${rice.color.bright-magenta}ff) rgba(${rice.color.magenta}), pinned:1" ]; windowrule = [ - "opacity ${transparency}, firefox" + # "opacity ${transparency}, firefox" "opacity ${transparency}, code-oss" "opacity ${transparency}, VSCodium" "opacity ${transparency}, Code" "opacity ${transparency}, neovide" "opacity ${transparency}, obsidian" "opacity ${transparency}, zathura" - "bordercolor rgba(ffffffff) rgba(000000b2), Alacritty" - "bordercolor rgba(ffffffff) rgba(000000b2), Kitty" + "bordercolor rgba(${rice.color.foreground}ff) rgba(${rice.color.background}b2), Alacritty" + "bordercolor rgba(${rice.color.foreground}ff) rgba(${rice.color.background}b2), Kitty" "opacity ${transparency}, discord" "opacity ${transparency}, vesktop" "opacity ${transparency}, Element" diff --git a/home-modules/kitty.nix b/home-modules/kitty.nix index 645e96d..41c544c 100644 --- a/home-modules/kitty.nix +++ b/home-modules/kitty.nix @@ -1,5 +1,5 @@ -{ config, pkgs, rice, ...}: -let +{ config, pkgs, rice, ... }: +let in { @@ -11,25 +11,25 @@ in enable = true; font = rice.font.code; settings = { - background = "#000000"; - foreground = "#919191"; - cursor = "#919191"; - color0 = "#303030"; - color8 = "#5e5e5e"; - color1 = "#a43261"; - color9 = "#ff9fc9"; - color2 = "#006ca5"; - color10 = "#3bd6ff"; - color3 = "#0061b1"; - color11 = "#93c9ff"; - color4 = "#913e88"; - color12 = "#ffa7f6"; - color5 = "#007086"; - color13 = "#00ddf4"; - color6 = "#6751a6"; - color14 = "#d5b8ff"; - color7 = "#c6c6c6"; - color15 = "#ffffff"; + background = "#${rice.color.background}"; + foreground = "#${rice.color.foreground}"; + cursor = "#${rice.color.foreground}"; + color0 = "#${rice.color.black}"; + color8 = "#${rice.color.bright-black}"; + color1 = "#${rice.color.red}"; + color9 = "#${rice.color.bright-red}"; + color2 = "#${rice.color.green}"; + color10 = "#${rice.color.bright-green}"; + color3 = "#${rice.color.yellow}"; + color11 = "#${rice.color.bright-yellow}"; + color4 = "#${rice.color.blue}"; + color12 = "#${rice.color.bright-blue}"; + color5 = "#${rice.color.magenta}"; + color13 = "#${rice.color.bright-magenta}"; + color6 = "#${rice.color.cyan}"; + color14 = "#${rice.color.bright-cyan}"; + color7 = "#${rice.color.white}"; + color15 = "#${rice.color.bright-white}"; background_opacity = rice.transparency; transparency = true; scroll_multiplier = 9; @@ -37,4 +37,6 @@ in window_padding_height = 5; }; }; -} \ No newline at end of file +} + + diff --git a/home-modules/shell/fish.nix b/home-modules/shell/fish.nix index 7c4c2b0..8346631 100644 --- a/home-modules/shell/fish.nix +++ b/home-modules/shell/fish.nix @@ -21,10 +21,10 @@ msg=" $(echo -e "$logo" | sed -n 3p): $(cat /etc/*-release | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev) - $(echo -e "$logo" | sed -n 4p): ''${DESKTOP_SESSION^} + $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^} $(echo -e "$logo" | sed -n 5p): ''${TERM^} - $(echo -e "$logo" | sed -n 6p): ''${SHELL} - $(echo -e "$logo" | sed -n 7p): fish + $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ') + $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev) $(echo -e "$logo" | sed -n 8p): ''$(uname -r) $(echo -e "$logo" | sed -n 9p): ''${EDITOR} $(echo -e "$logo" | sed -n 10p): $(yazi --version) diff --git a/home-modules/shell/starship.nix b/home-modules/shell/starship.nix index 78505b1..f9fc9f4 100644 --- a/home-modules/shell/starship.nix +++ b/home-modules/shell/starship.nix @@ -12,97 +12,166 @@ enable = true; settings = { add_newline = false; - format = "$jobs\$battery\$username\$hostname\$localip\$shlvl\$singularity\$kubernetes\$directory\$vcsh\$git_branch\$git_commit\$git_state\$git_metrics\$git_status\$hg_branch\$docker_context\$package\$c\$cmake\$cobol\$daml\$dart\$deno\$dotnet\$elixir\$elm\$erlang\$golang\$haskell\$helm\$java\$julia\$kotlin\$lua\$nim\$nodejs\$ocaml\$perl\$php\$pulumi\$purescript\$python\$raku\$rlang\$red\$ruby\$rust\$scala\$swift\$terraform\$vlang\$vagrant\$zig\$buf\$nix_shell\$conda\$meson\$spack\$memory_usage\$aws\$gcloud\$openstack\$azure\$env_var\$crystal\$custom\$sudo\$cmd_duration\$time\$status\$container\$shell\$character"; - aws.format = "[\\[$symbol($profile)(\\($region\\))(\\[$duration\\])\\]]($style)"; - bun.format = "[\\[$symbol($version)\\]]($style)"; - c.format = "[\\[$symbol($version(-$name))\\]]($style)"; - cmake.format = "[\\[$symbol($version)\\]]($style)"; - cmd_duration.format = "[\\[󰔛 $duration\\]]($style)"; - cobol.format = "[\\[$symbol($version)\\]]($style)"; - conda.format = "[\\[$symbol$environment\\]]($style)"; - crystal.format = "[\\[$symbol($version)\\]]($style)"; - daml.format = "[\\[$symbol($version)\\]]($style)"; - dart.format = "[\\[$symbol($version)\\]]($style)"; - deno.format = "[\\[$symbol($version)\\]]($style)"; - docker_context.format = "[\\[$symbol$context\\]]($style)"; - dotnet.format = "[\\[$symbol($version)(🎯 $tfm)\\]]($style)"; - elixir.format = "[\\[$symbol($version \\(OTP $otp_version\\))\\]]($style)"; - elm.format = "[\\[$symbol($version)\\]]($style)"; - erlang.format = "[\\[$symbol($version)\\]]($style)"; - gcloud.format = "[\\[$symbol$account(@$domain)(\\($region\\))\\]]($style)"; - git_branch = { - format = "[\\[$symbol$branch:]($style)"; - style = "bold green"; - }; - git_status = { - format = "([$all_status$ahead_behind]($style))(bold green)[\\]]($style)"; - style = "blue yellow"; - }; - golang.format = "[\\[$symbol($version)\\]]($style)"; - haskell.format = "[\\[$symbol($version)\\]]($style)"; - helm.format = "[\\[$symbol($version)\\]]($style)"; - hg_branch.format = "[\\[$symbol$branch\\]]($style)"; - java.format = "[\\[$symbol($version)\\]]($style)"; - julia.format = "[\\[$symbol($version)\\]]($style)"; - kotlin.format = "[\\[$symbol($version)\\]]($style)"; - kubernetes.format = "[\\[$symbol$context( \\($namespace\\))\\]]($style)"; - lua.format = "[\\[$symbol($version)\\]]($style)"; - memory_usage.format = "[\\[$symbol[$ram( | $swap)\\]]($style)"; - meson.format = "[\\[$symbol$project\\]]($style)"; - nim.format = "[\\[$symbol($version)\\]]($style)"; - nix_shell.format = "[\\[$symbol$state( \\($name\\))\\]]($style)"; - nodejs.format = "[\\[$symbol($version)\\]]($style)"; - ocaml.format = "[\\[$symbol($version)(\\($switch_indicator$switch_name\\))\\]]($style)"; - openstack.format = "[\\[$symbol$cloud(\\($project\\))\\]]($style)"; - package.format = "[\\[$symbol$version\\]]($style)"; - perl.format = "[\\[$symbol($version)\\]]($style)"; - php.format = "[\\[$symbol($version)\\]]($style)"; - pulumi.format = "[\\[$symbol$stack\\]]($style)"; - purescript.format = "[\\[$symbol($version)\\]]($style)"; + format = lib.strings.concatMapStrings (x: "$" + x) [ + "jobs" + "battery" + "username" + "hostname" + # "localip" + "shlvl" + # "singularity" + # "kubernetes" + "directory" + # "vcsh" + "git_branch" + "git_commit" + "git_state" + "git_metrics" + "git_status" + # "hg_branch" + "docker_context" + # "package" + "c" + "cmake" + # "cobol" + # "daml" + # "dart" + # "deno" + # "dotnet" + "elixir" + # "elm" + # "erlang" + "golang" + "haskell" + # "helm" + # "java" + # "julia" + # "kotlin" + "lua" + "nim" + "nodejs" + # "ocaml" + # "perl" + "php" + # "pulumi" + # "purescript" + "python" + # "raku" + # "rlang" + # "red" + # "ruby" + # "rust" + # "scala" + # "swift" + # "terraform" + # "vlang" + # "vagrant" + "zig" + # "buf" + "nix_shell" + "conda" + # "meson" + # "spack" + # "memory_usage" + # "aws" + # "gcloud" + # "openstack" + # "azure" + "env_var" + # "crystal" + "custom" + "sudo" + "cmd_duration" + "time" + "status" + "container" + "shell" + "character" + ]; + aws.format = "[\\[$symbol($profile)(\\($region\\))(\\[$duration\\])\\]]($style)"; + bun.format = "[\\[$symbol($version)\\]]($style)"; + c.format = "[\\[$symbol($version(-$name))\\]]($style)"; + cmake.format = "[\\[$symbol($version)\\]]($style)"; + cmd_duration.format = "[\\[$symbol$duration\\]]($style)"; + cobol.format = "[\\[$symbol($version)\\]]($style)"; + conda.format = "[\\[$symbol$environment\\]]($style)"; + crystal.format = "[\\[$symbol($version)\\]]($style)"; + daml.format = "[\\[$symbol($version)\\]]($style)"; + dart.format = "[\\[$symbol($version)\\]]($style)"; + deno.format = "[\\[$symbol($version)\\]]($style)"; + docker_context.format = "[\\[$symbol($context)\\]]($style)"; + dotnet.format = "[\\[$symbol($version)(🎯 $tfm)\\]]($style)"; + elixir.format = "[\\[$symbol($version \\(OTP $otp_version\\))\\]]($style)"; + elm.format = "[\\[$symbol($version)\\]]($style)"; + erlang.format = "[\\[$symbol($version)\\]]($style)"; + gcloud.format = "[\\[$symbol$account(@$domain)(\\($region\\))\\]]($style)"; + git_branch.format = "[\\[$symbol$branch:]($style)"; + git_status.format = "([$all_status$ahead_behind]($style))(bold green)[\\]]($style)"; + golang.format = "[\\[$symbol($version)\\]]($style)"; + haskell.format = "[\\[$symbol($version)\\]]($style)"; + helm.format = "[\\[$symbol($version)\\]]($style)"; + hg_branch.format = "[\\[$symbol$branch\\]]($style)"; + java.format = "[\\[$symbol($version)\\]]($style)"; + julia.format = "[\\[$symbol($version)\\]]($style)"; + kotlin.format = "[\\[$symbol($version)\\]]($style)"; + kubernetes.format = "[\\[$symbol$context( \\($namespace\\))\\]]($style)"; + lua.format = "[\\[$symbol($version)\\]]($style)"; + memory_usage.format = "[\\[$symbol[$ram( | $swap)\\]]($style)"; + meson.format = "[\\[$symbol$project\\]]($style)"; + nim.format = "[\\[$symbol($version)\\]]($style)"; + nix_shell.format = "[\\[$symbol$state( \\($name\\))\\]]($style)"; + nodejs.format = "[\\[$symbol($version)\\]]($style)"; + ocaml.format = "[\\[$symbol($version)(\\($switch_indicator$switch_name\\))\\]]($style)"; + openstack.format = "[\\[$symbol$cloud(\\($project\\))\\]]($style)"; + package.format = "[\\[$symbol$version\\]]($style)"; + perl.format = "[\\[$symbol($version)\\]]($style)"; + php.format = "[\\[$symbol($version)\\]]($style)"; + pulumi.format = "[\\[$symbol$stack\\]]($style)"; + purescript.format = "[\\[$symbol($version)\\]]($style)"; python = { - format = ''[\[''${symbol}''${pyenv_prefix}''${version}$virtualenv\]]($style)''; + format = ''[\[''${symbol}''${pyenv_prefix}''${version}$virtualenv\]]($style)''; symbol = " "; }; - raku.format = "[\\[$symbol($version-$vm_version)\\]]($style)"; - red.format = "[\\[$symbol($version)\\]]($style)"; - ruby.format = "[\\[$symbol($version)\\]]($style)"; - rust.format = "[\\[$symbol($version)\\]]($style)"; - scala.format = "[\\[$symbol($version)\\]]($style)"; - spack.format = "[\\[$symbol$environment\\]]($style)"; - sudo.format = "[\\[$symbol]\\]"; - swift.format = "[\\[$symbol($version)\\]]($style)"; - terraform.format = "[\\[$symbol$workspace\\]]($style)"; - time.format = "[\\[$time\\]]($style)"; - username.format = "[\\[$user\\]]($style)"; - vagrant.format = "[\\[$symbol($version)\\]]($style)"; - vlang.format = "[\\[$symbol($version)\\]]($style)"; - zig.format = "[\\[$symbol($version)\\]]($style)"; + raku.format = "[\\[$symbol($version-$vm_version)\\]]($style)"; + red.format = "[\\[$symbol($version)\\]]($style)"; + ruby.format = "[\\[$symbol($version)\\]]($style)"; + rust.format = "[\\[$symbol($version)\\]]($style)"; + scala.format = "[\\[$symbol($version)\\]]($style)"; + spack.format = "[\\[$symbol$environment\\]]($style)"; + sudo.format = "[\\[$symbol]\\]"; + swift.format = "[\\[$symbol($version)\\]]($style)"; + terraform.format = "[\\[$symbol$workspace\\]]($style)"; + time.format = "[\\[$time\\]]($style)"; + username.format = "[\\[$user\\]]($style)"; + vagrant.format = "[\\[$symbol($version)\\]]($style)"; + vlang.format = "[\\[$symbol($version)\\]]($style)"; + zig.format = "[\\[$symbol($version)\\]]($style)"; directory = { - format = "[\\[]($style)[$lock_symbol]($lock_style)[$path\\]]($style)"; + format = "[\\[]($style)[$lock_symbol]($lock_style)[$path\\]]($style)"; style = "cyan bold"; }; character = { format = "$symbol"; - success_symbol = "[\\[󰽧\\]](bold white) "; - error_symbol = "[\\[\\]](bold red) "; - vimcmd_symbol = "[\\[\\]](bold green) "; + success_symbol = "[\\[󰽧\\]](bold white) "; + error_symbol = "[\\[\\]](bold red) "; + vimcmd_symbol = "[\\[\\]](bold green) "; vimcmd_replace_one_symbol = "[\\[1\\]](bold green) "; - vimcmd_replace_symbol = "[\\[R\\]](bold green) "; - vimcmd_visual_symbol = "[\\[V\\]](bold green) "; + vimcmd_replace_symbol = "[\\[R\\]](bold green) "; + vimcmd_visual_symbol = "[\\[V\\]](bold green) "; }; - battery.format = "[\\[$symbol$percentage\\]]($style)"; - shlvl.format = "[\\[$symbol$shlvl\\]]($style)"; - singularity.format = "[\\[$symbol\\[$env\\]\\]]($style)"; + battery.format = "[\\[$symbol$percentage\\]]($style)"; + shlvl.format = "[\\[$symbol$shlvl\\]]($style)"; + singularity.format = "[\\[$symbol\\[$env\\]\\]]($style)"; jobs = { - format = "[\\[$symbol $number\\]]($style)"; + format = "[\\[$symbol $number\\]]($style)"; number_threshold = 1; }; - vcsh.format = "[\\[vcsh [$symbol$repo\\]]($style)"; + vcsh.format = "[\\[vcsh [$symbol$repo\\]]($style)"; hostname = { - format = "[\\[$ssh_symbol$hostname\\]]($style)"; + format = "[\\[$ssh_symbol$hostname\\]]($style)"; ssh_symbol = "爵"; ssh_only = true; }; - }; - }; + }; + }; } \ No newline at end of file diff --git a/home-modules/vscode.nix b/home-modules/vscode.nix index 0eab675..36eb0ae 100644 --- a/home-modules/vscode.nix +++ b/home-modules/vscode.nix @@ -56,6 +56,12 @@ version = "1.26.1"; sha256 = "sha256-WO9vYELNvwmuNeI05sUBE969KAiKYtrJ1fRfdZx3OYU="; } + { + name = "color-highlight"; + publisher = "naumovs"; + version = "2.8.0"; + sha256 = "sha256-mT2P1lEdW66YkDRN6fi0rmmvvyBfXiJjAUHns8a8ipE="; + } # { # name = "remote-ssh-edit"; # publisher = "ms-vscode-remote"; diff --git a/home-modules/wlogout.nix b/home-modules/wlogout.nix index 4b32f4d..9ea6402 100644 --- a/home-modules/wlogout.nix +++ b/home-modules/wlogout.nix @@ -11,7 +11,7 @@ window { font-family: ${rice.font.code.name}, monospace; font-size: 12pt; - color: ${rice.colors.main-fg}; + color: ${rice.color.foreground}; background-color: rgba(0, 0, 0, ${rice.transparency}); } @@ -19,17 +19,17 @@ transition: box-shadow 0.2s ease-in-out, background-color 0.2s ease-in-out; text-shadow: none; border: none; - color: ${rice.colors.main-fg}; - background-color: ${rice.colors.secondary-bg}; + color: ${rice.color.foreground}; + background-color: ${rice.color.background}; margin: 5px; } button:hover { - color: ${rice.colors.accent} ; + color: ${rice.color.blue} ; } button:focus { - color: ${rice.colors.accent} ; + color: ${rice.color.blue} ; } ''; diff --git a/home.nix b/home.nix index 692cfec..7af955a 100644 --- a/home.nix +++ b/home.nix @@ -86,6 +86,7 @@ defaultApplications = { "default-web-browser" = [ "firefox.desktop" ]; "text/html" = [ "firefox.desktop" ]; + "text/htm" = [ "firefox.desktop" ]; "x-scheme-handler/http" = [ "firefox.desktop" ]; "x-scheme-handler/https" = [ "firefox.desktop" ]; "x-scheme-handler/about" = [ "firefox.desktop" ]; @@ -95,6 +96,7 @@ "image/jpeg" = "imv.desktop"; "image/webp" = "imv.desktop"; "image/gif" = "imv.desktop"; + "application/pdf" = "zathura.desktop"; }; }; }; diff --git a/system-modules/hardware-configuration.nix b/system-modules/hardware-configuration.nix index ad5a80b..0955377 100644 --- a/system-modules/hardware-configuration.nix +++ b/system-modules/hardware-configuration.nix @@ -1,28 +1,35 @@ { config, lib, user, host, pkgs, modulesPath, ... }: - { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + environment.systemPackages = if host == "NxNORTH" then with pkgs; [ + ntfs3g + btrfs-progs + ] else with pkgs; [ + ntfs3g + ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; # boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-label/nixos"; - fsType = "ext4"; + # fileSystems = if lib.pathExists /dev/disk/by-label/shared == true then { + # "/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; }; + # "/boot" = { device = "/dev/disk/by-label/EFI"; fsType = "vfat"; }; + # "/home/${user}/shared" = { device = "/dev/disk/by-label/shared"; fsType = if host == "NxXPS" then "ntfs" else "btrfs"; }; + # } else { + # "/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; }; + # "/boot" = { device = "/dev/disk/by-label/EFI"; fsType = "vfat"; }; + # }; + fileSystems = { + "/" = { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; }; + "/boot" = { device = "/dev/disk/by-label/EFI"; fsType = "vfat"; }; + "/home/${user}/shared" = { device = "/dev/disk/by-label/shared"; fsType = if host == "NxXPS" then "ntfs" else "btrfs"; }; }; - fileSystems."/boot" = { - device = "/dev/disk/by-label/EFI"; - fsType = "vfat"; - }; - #fileSystems."/home/${user}/shared" = if { - # device = "/dev/disk/by-label/shared"; - # fsType = if host == "NxXPS" then "ntfs" else "btrfs"; - #}; swapDevices = [ { device = "/dev/disk/by-label/swap"; } @@ -35,20 +42,18 @@ # from nixos-hardware services.thermald.enable = lib.mkDefault true; - boot.extraModprobeConfig = '' + boot.extraModprobeConfig = if host == "NxXPS" then '' options iwlwifi 11n_disable=8 - ''; - boot.initrd.kernelModules = [ "i915" ]; + '' else ""; + boot.initrd.kernelModules = if host == "NxXPS" then [ "i915" ] else []; - environment.variables = { + environment.variables = if host == "NxXPS" then { VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl"); - }; + } else {}; - hardware.opengl.extraPackages = with pkgs; [ + hardware.opengl.extraPackages = if host == "NxXPS" then with pkgs; [ (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver) libvdpau-va-gl intel-media-driver - ]; - - + ] else []; }