From 683913e0fe57b4b3898236d9b1ff795b974a813b Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:42:49 +0100 Subject: [PATCH 01/15] rice syntax --- flake-modules/rice.nix | 67 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix index 30cd6f7..49d9642 100644 --- a/flake-modules/rice.nix +++ b/flake-modules/rice.nix @@ -6,40 +6,39 @@ pkgs: rec { rounding = 3; gap-size = 5; border-width = 2; - color = - let - dark = (-0.5); - bright = (0.5); - alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; - alter = let f = lib.alter-luminace-hex; in color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; - # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)); - ccolor = builtins.mapAttrs alter-set { - black = "#111111"; # "#111111" "#001100"; - white = "#dddddd"; # "#dddddd" "#66dd66"; - blue = "#4444dd"; # "#3333dd" "#003300"; - cyan = "#44dddd"; # "#11dddd" "#00dd55"; - green = "#44dd44"; # "#11dd11" "#11dd11"; - magenta = "#dd44dd"; # "#dd11dd" "#005500"; - red = "#dd4444"; # "#dd1111" "#00aa00"; - yellow = "#dddd44"; # "#dddd11" "#ffff00"; - }; - facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter; - fbcolor = (builtins.fromJSON (builtins.readFile ./colors.json)).base; - fcolor = facolor // fbcolor; - xcolor = with ccolor; with fcolor; rec { - background = "#000000"; - # foreground = "#dddddd"; - # accent = blue; - # secondary = cyan; - # tertiary = magenta; - # special = yellow; - # weird = green; - positive = alter "#00dd00"; - negative = alter "#dd0000"; - border = accent.base; - border2 = secondary.base; - }; - in ccolor // fcolor // xcolor; + color = let + dark = (-0.5); + bright = (0.5); + alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; + alter = let f = lib.alter-luminace-hex; in color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; + # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)); + ccolor = builtins.mapAttrs alter-set { + black = "#111111"; # "#111111" "#001100"; + white = "#dddddd"; # "#dddddd" "#66dd66"; + blue = "#4444dd"; # "#3333dd" "#003300"; + cyan = "#44dddd"; # "#11dddd" "#00dd55"; + green = "#44dd44"; # "#11dd11" "#11dd11"; + magenta = "#dd44dd"; # "#dd11dd" "#005500"; + red = "#dd4444"; # "#dd1111" "#00aa00"; + yellow = "#dddd44"; # "#dddd11" "#ffff00"; + }; + facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter; + fbcolor = (builtins.fromJSON (builtins.readFile ./colors.json)).base; + fcolor = facolor // fbcolor; + xcolor = with ccolor; with fcolor; { + background = "#000000"; + # foreground = "#dddddd"; + # accent = blue; + # secondary = cyan; + # tertiary = magenta; + # special = yellow; + # weird = green; + positive = alter "#00dd00"; + negative = alter "#dd0000"; + border = accent.base; + border2 = secondary.base; + }; + in ccolor // fcolor // xcolor; font = { code = { name = "JetBrainsMono-NF"; From 219a19a3a8bc858b34a60d9131c5cc6b1a7626eb Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:46:32 +0100 Subject: [PATCH 02/15] fonts (no name2) --- flake-modules/rice.nix | 3 +-- home-modules/color-pallete.nix | 2 +- home-modules/kitty.nix | 2 +- home-modules/mako.nix | 2 +- home-modules/rofi.nix | 2 +- home-modules/vscode.nix | 2 +- home-modules/waybar.nix | 4 ++-- system-modules/fonts.nix | 3 ++- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix index 49d9642..c5daa53 100644 --- a/flake-modules/rice.nix +++ b/flake-modules/rice.nix @@ -41,8 +41,7 @@ pkgs: rec { in ccolor // fcolor // xcolor; font = { code = { - name = "JetBrainsMono-NF"; - name2 = "JetBrainsMono Nerd Font"; + name = "JetBrainsMono Nerd Font"; package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }); # name = "CascadiaCove-NF"; # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; }); diff --git a/home-modules/color-pallete.nix b/home-modules/color-pallete.nix index 797a03e..b8731de 100644 --- a/home-modules/color-pallete.nix +++ b/home-modules/color-pallete.nix @@ -46,7 +46,7 @@ margin: ${builtins.toString rice.gap-size}px; } .color-container { - font-family: ${rice.font.code.name2}; + font-family: ${rice.font.code.name}; display: flex; gap: ${builtins.toString rice.gap-size}px; margin: ${builtins.toString rice.gap-size}px; diff --git a/home-modules/kitty.nix b/home-modules/kitty.nix index 8a99779..710fb1e 100755 --- a/home-modules/kitty.nix +++ b/home-modules/kitty.nix @@ -3,7 +3,7 @@ programs.kitty = { enable = true; font = { - name = rice.font.code.name2; + name = rice.font.code.name; package = rice.font.code.package; }; settings = with rice.color; { diff --git a/home-modules/mako.nix b/home-modules/mako.nix index 0d9e4c2..712943b 100755 --- a/home-modules/mako.nix +++ b/home-modules/mako.nix @@ -8,7 +8,7 @@ textColor = color.foreground; borderColor = color.border; borderSize = border-width; - font = font.code.name2; + font = font.code.name; borderRadius = rounding; anchor = "top-right"; margin = builtins.toString (gap-size * 2) ; diff --git a/home-modules/rofi.nix b/home-modules/rofi.nix index b342b50..880b5e2 100755 --- a/home-modules/rofi.nix +++ b/home-modules/rofi.nix @@ -14,7 +14,7 @@ } * { - font: "${rice.font.code.name2} 12"; + font: "${rice.font.code.name} 12"; foreground: ${foreground}; background-color: ${background}${trdr}; padding: 0px; diff --git a/home-modules/vscode.nix b/home-modules/vscode.nix index b38d123..6ef5d6d 100755 --- a/home-modules/vscode.nix +++ b/home-modules/vscode.nix @@ -65,7 +65,7 @@ ]; userSettings = { workbench.colorTheme = "Just Black"; - editor.fontFamily = "'${rice.font.code.name2}', 'monospace', monospace"; + editor.fontFamily = "'${rice.font.code.name}', 'monospace', monospace"; remote.SSH.useLocalServer = false; }; enableUpdateCheck = false; diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix index d7e0bed..6cba5d8 100755 --- a/home-modules/waybar.nix +++ b/home-modules/waybar.nix @@ -163,7 +163,7 @@ in { }; style = with rice.color; let f = rice.lib.hex-to-rgb-comma-string; in '' * { - font-family: ${rice.font.code.name2}; + font-family: ${rice.font.code.name}; font-size: 1em; min-height: 0px; margin: 0px; @@ -223,7 +223,7 @@ in { } #window, #custom-ctimeremaining { - font-family: ${rice.font.base.name}, ${rice.font.code.name2}; + font-family: ${rice.font.base.name}, ${rice.font.code.name}; color: rgb(${f tertiary.bright}); } diff --git a/system-modules/fonts.nix b/system-modules/fonts.nix index 7d32cd4..9c88a2e 100644 --- a/system-modules/fonts.nix +++ b/system-modules/fonts.nix @@ -7,7 +7,8 @@ { fonts.packages = with pkgs; [ noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans + noto-fonts-cjk-serif noto-fonts-emoji newcomputermodern atkinson-hyperlegible From e36ffd828bc496a088c6d4ffacd3dd7365ab4b05 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:46:51 +0100 Subject: [PATCH 03/15] chatterino update --- git-crypt/secrets.nix | Bin 3129 -> 3129 bytes home-modules/chatterino.nix | 26 +++----------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index 7f066b13a1e712156ab46843331e2fd5162c2ad2..2ef5a992a9d7135afa13051372cc6ca283fe0eb8 100755 GIT binary patch literal 3129 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 literal 3129 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 diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index 5a0970b..342d2a3 100755 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -1,51 +1,31 @@ { pkgs, lib, rice, user, secrets, ... }: let channels = [ - "Caedrel" - "NoWay4u_Sir" - "zackrawrr" - "agurin" "asmongold" - "Broeki" - "Broxah" - # "Caedrel" - "chrissyofficial" + "Caedrel" "EintrachtSpandau" "GamesDoneQuick" "gdolphn" "GRONKH" "handofblood" "HisWattson" - "imls" - "iskall85" "Jankos" - "Karni" "KuruHS" "kutcherlol" - "LCK" - "LCS" "LEC" "lol_nemesis" - "loltyler1" - "LPL" - "maxim" "NASA" "NNOPrime" - # "NoWay4u_Sir" + "NoWay4u_Sir" "OfficialMikeShinoda" - "ow_esports" - "PrimeGaming" - "PrimeLeague" "Rekkles" "riotgames" - "Sola" "ThePrimeagen" "Tolkin" - "Trick2g" "TSM_ImperialHal" "Xisuma" - # "zackrawrr" + "zackrawrr" ]; tabber = channel-name: { highlightsEnabled = true; From 02c7814ce43d0e868dacc8c783c211d88750bfa3 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:49:33 +0100 Subject: [PATCH 04/15] better/less userChrome --- home-modules/email.nix | 28 +++++++++------------------- home-modules/firefox.nix | 11 +++++++++-- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/home-modules/email.nix b/home-modules/email.nix index b2a227c..36e9a98 100755 --- a/home-modules/email.nix +++ b/home-modules/email.nix @@ -9,14 +9,7 @@ lib.mkIf (host != "NxACE") programs.thunderbird = let inherit (lib.generators) toJSON; extensions = toJSON {} { - "default-theme@mozilla.org" = "5787f490-29b8-436e-a111-640da8590790"; - "google@search.mozilla.org" = "cc340383-7068-4b32-a10f-9f19334bfebc"; - "ddg@search.mozilla.org" = "0c340210-f7ab-48e8-9778-600ed5d00160"; - "amazondotcom@search.mozilla.org" = "881d8fdf-5772-4e33-81ff-faac2d1fa92c"; - "wikipedia@search.mozilla.org" = "7ea3d39d-3eea-430f-9bd7-f902d8124d45"; - "bing@search.mozilla.org" = "f480cce8-68af-4082-908e-f8996153352b"; "addon@darkreader.org" = "71d6c69d-55f9-4c56-888c-abdcf6efd73d"; - "lightningcalendartabs@jlx.84" = "12d48e41-412e-4d09-835a-fa6fb8c180eb"; }; in { enable = true; @@ -48,23 +41,20 @@ lib.mkIf (host != "NxACE") "mailnews.headers.showUserAgent" = true; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; }; - userChrome = with rice.color; /* css */ '' - * { - color: ${rice.lib.hex-to-rgb-comma-string foreground} !important; - background-color: rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important; - border: none !important; - } - treechildren::-moz-tree-row(odd), treechildren::-moz-tree-row(even) { - background-color: rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important; - } - ''; + # userChrome = with rice.color; /* css */ '' + # * { + # color: ${foreground} !important; + # background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString 0.1}) !important; + # border: none !important; + # -moz-appearance: none !important; + # } + # ''; }; }; }; - accounts.email.accounts = - let + accounts.email.accounts = let OAuth2Settings = id: { "mail.smtpserver.smtp_${id}.authMethod" = 10; "mail.server.server_${id}.authMethod" = 10; diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index ebafb53..8895660 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -1,10 +1,11 @@ # { pkgs-unstable, secrets, user, system, inputs, ...}: { rice, user, ... }: # browser.tabs.allow_transparent_browser +# https://www.reddit.com/r/FirefoxCSS/comments/1dqws4b/firefox_128_will_allow_the_main_browser_content/ { home.file = with rice.color; let - blur = builtins.toString 20; - in { + blur = builtins.toString 20; + in { ".mozilla/firefox/${user}/chrome/userChrome.css".text = /* css */ '' :root{ /* Popup panels */ @@ -110,9 +111,15 @@ /* new-tab */ @-moz-document url-prefix(about:home), url-prefix(about:newtab) { + :root{ + --newtab-background-color-secondary: ${background} !important; + } body, html { background: transparent !important; } + .tile, .search-handoff-button { + border: ${builtins.toString rice.border-width}px solid ${border} !important; + } } @-moz-document domain(youtube.com) { From f828268b14dc3d091fb80701f069102fcd28bc4c Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:59:00 +0100 Subject: [PATCH 05/15] 24.11 Vicuna --- configuration.nix | 2 +- flake.nix | 4 +- home-modules/fish.nix | 12 +-- home-modules/hyprland.nix | 122 +++++++++++----------- home.nix | 2 +- system-modules/hardware-configuration.nix | 2 +- system-modules/nvidia.nix | 7 +- system-modules/ollama.nix | 3 +- 8 files changed, 78 insertions(+), 76 deletions(-) diff --git a/configuration.nix b/configuration.nix index 9e989cb..20bd41d 100755 --- a/configuration.nix +++ b/configuration.nix @@ -117,7 +117,7 @@ xwayland.enable = true; }; - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; nixpkgs.config.allowUnfree = true; diff --git a/flake.nix b/flake.nix index 3311f3f..e186242 100755 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Multisystem NixOS Flake of Lennart J. Kurzweg"; inputs = { - nixpkgs = { url = "nixpkgs/nixos-24.05"; }; + nixpkgs = { url = "nixpkgs/nixos-24.11"; }; nixpkgs-unstable = { url = "nixpkgs/nixos-unstable"; }; nixpkgs-latest = { url = "github:nixos/nixpkgs?ref=master"; }; - home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; }; diff --git a/home-modules/fish.nix b/home-modules/fish.nix index bff6943..0307a45 100755 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -27,7 +27,7 @@ $(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 --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g') - $(echo -e "$logo" | sed -n 10p): $(yazi --version | yazi --version | sed -E 's-(.*?) \(.*-\1-g') + $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g') $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1) " echo -e "$msg" @@ -85,20 +85,18 @@ # ya = "yazi"; # function # nxfiglet = "figlet"; }; - interactiveShellInit = '' + interactiveShellInit = /* fish */ '' set -g fish_greeting if not set -q IN_NIX_SHELL - nxfetch - # yazi if set -q SESSION_FROM_DE - set -e SESSION_FROM_DE set tmp (mktemp -t "yazi-cwd.XXXXX") - yazi $argv --cwd-file="$tmp" + yazi --cwd-file="$tmp" if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] - cd -- "$cwd" + builtin cd -- "$cwd" end rm -f -- "$tmp" end + nxfetch end ''; functions = { diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index bb527f9..9f6a82f 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -92,47 +92,49 @@ in { "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}" ])); - workspace = - let - d1 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); - d2 = if host == "NxXPS" then monitors.xps.second.name else (if host == "NxNORTH" then monitors.north.left.name else monitors.ace.main.name); - d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); - # d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.right.name else monitors.ace.main.name); - compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false"; - in - [ - "11, monitor:${d1}, default:true" - "12, monitor:${d1}" - "13, monitor:${d1}" - "14, monitor:${d1}" - "15, monitor:${d1}" - "16, monitor:${d1}" - "17, monitor:${d1}" - "18, monitor:${d1}" - "19, monitor:${d1}" - "10, monitor:${d1}, ${compact}" - "100, monitor:${d1}, ${compact}" - "21, monitor:${d2}, default:true, ${compact}" - "22, monitor:${d2}" - "23, monitor:${d2}" - "24, monitor:${d2}" - "25, monitor:${d2}" - "26, monitor:${d2}" - "27, monitor:${d2}" - "28, monitor:${d2}" - "29, monitor:${d2}" - "20, monitor:${d2}" - "31, monitor:${d3}, default:${let x = if host == "NxNORTH" then "true" else "false"; in x}" - "32, monitor:${d3}" - "33, monitor:${d3}" - "34, monitor:${d3}" - "35, monitor:${d3}" - "36, monitor:${d3}" - "37, monitor:${d3}" - "38, monitor:${d3}" - "39, monitor:${d3}" - "30, monitor:${d3}, ${compact}" - ]; + workspace = let + d1 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); + d2 = if host == "NxXPS" then monitors.xps.second.name else (if host == "NxNORTH" then monitors.north.left.name else monitors.ace.main.name); + d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); + # d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.right.name else monitors.ace.main.name); + compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false"; + in [ + "11, monitor:${d1}, default:true" + "12, monitor:${d1}" + "13, monitor:${d1}" + "14, monitor:${d1}" + "15, monitor:${d1}" + "16, monitor:${d1}" + "17, monitor:${d1}" + "18, monitor:${d1}" + "19, monitor:${d1}" + "10, monitor:${d1}, ${compact}" + "100, monitor:${d1}, ${compact}" + "21, monitor:${d2}, default:true, ${compact}" + "22, monitor:${d2}" + "23, monitor:${d2}" + "24, monitor:${d2}" + "25, monitor:${d2}" + "26, monitor:${d2}" + "27, monitor:${d2}" + "28, monitor:${d2}" + "29, monitor:${d2}" + "20, monitor:${d2}" + "31, monitor:${d3}, default:${let x = if host == "NxNORTH" then "true" else "false"; in x}" + "32, monitor:${d3}" + "33, monitor:${d3}" + "34, monitor:${d3}" + "35, monitor:${d3}" + "36, monitor:${d3}" + "37, monitor:${d3}" + "38, monitor:${d3}" + "39, monitor:${d3}" + "30, monitor:${d3}, ${compact}" + ] ++ [ + # no gaps when only + "w[tv1], gapsout:0, gapsin:0" + "f[1], gapsout:0, gapsin:0" + ]; # "device:logitech-wireless-mouse-mx-master-1" = { # sensitivity = -0.2; @@ -175,12 +177,12 @@ in { decoration = { rounding = rice.rounding; - drop_shadow = false; - shadow_range = "20"; - shadow_offset = "0 0"; - shadow_render_power = "4"; - "col.shadow" = "rgba(${rice.lib.nohash rice.color.red.base}ff)"; - "col.shadow_inactive" = "rgba(${rice.lib.nohash rice.color.black.base}ff)"; + # drop_shadow = false; + # shadow_range = "20"; + # shadow_offset = "0 0"; + # shadow_render_power = "4"; + # "col.shadow" = "rgba(${rice.lib.nohash rice.color.red.base}ff)"; + # "col.shadow_inactive" = "rgba(${rice.lib.nohash rice.color.black.base}ff)"; active_opacity = "1.0"; inactive_opacity = "1.0"; @@ -229,7 +231,6 @@ in { dwindle = { preserve_split = true; # you probably want this - no_gaps_when_only = true; }; # master = { @@ -259,6 +260,11 @@ in { "opacity ${transparency},class:^(com.chatterino.*)$" "opacity ${transparency},class:^(chatterino)$" "bordercolor rgba(${rice.lib.nohash rice.color.magenta.bright}ff), pinned:1" + ] ++ [ + "bordersize 0, floating:0, onworkspace:w[tv1]" + "rounding 0, floating:0, onworkspace:w[tv1]" + "bordersize 0, floating:0, onworkspace:f[1]" + "rounding 0, floating:0, onworkspace:f[1]" ]; windowrule = [ @@ -275,12 +281,12 @@ in { "opacity ${transparency}, discord" "opacity ${transparency}, vesktop" "opacity ${transparency}, Element" - "opacity ${transparency}, thunderbird" + # "opacity ${transparency}, thunderbird" "opacity ${transparency}, lutris" "opacity ${transparency}, element" - "opacity ${transparency}, ^([sS]potify)$" - "opacity ${transparency}, virt-manager" - "opacity ${transparency}, thunar" + # "opacity ${transparency}, ^([sS]potify)$" + # "opacity ${transparency}, virt-manager" + # "opacity ${transparency}, thunar" "opacity ${transparency}, title:^(wlogout)$" "opaque, title:^(GNU Image Manipulation Program)$" "float, title:^(Picture-in-Picture)$" @@ -327,7 +333,7 @@ in { "SUPER, F1, workspace, 100" "SUPER SHIFT, F1, movetoworkspace, 100" # "SUPER, F2," - "SUPER, F3, toggleopaque" + # "SUPER, F3, toggleopaque" # "SUPER, F4," "SUPER, F5, exec, nx_gcal_event force-lookup" "SUPER SHIFT, F5, exec, nx_gcal_event reauthenticate" @@ -584,12 +590,10 @@ in { ''; }; - home.file = - let - m = if host == "NxXPS" then monitors.xps.main.name else monitors.north.main.name; - in - { - ".config/hypr/hyprlock.conf".text = '' + home.file = let + m = if host == "NxXPS" then monitors.xps.main.name else monitors.north.main.name; + in { + ".config/hypr/hyprlock.conf".text = '' background { monitor = ${m} diff --git a/home.nix b/home.nix index ec362ee..ce74e4c 100755 --- a/home.nix +++ b/home.nix @@ -72,7 +72,7 @@ imv mpv mediainfo exiftool ffmpeg pavucontrol - fontpreview gtk2fontsel + fontpreview lynx w3m browsh bat du-dust eza neofetch tldr fzf figlet ripgrep lolcat jq glow brightnessctl wev diff --git a/system-modules/hardware-configuration.nix b/system-modules/hardware-configuration.nix index 4e01f1b..0d4bc33 100755 --- a/system-modules/hardware-configuration.nix +++ b/system-modules/hardware-configuration.nix @@ -46,7 +46,7 @@ } else {}; hardware.opengl.extraPackages = if host == "NxXPS" then with pkgs; [ - (if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.05") then vaapiIntel else intel-vaapi-driver) + (if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") then vaapiIntel else intel-vaapi-driver) libvdpau-va-gl intel-media-driver ] else []; diff --git a/system-modules/nvidia.nix b/system-modules/nvidia.nix index 4921080..e346349 100755 --- a/system-modules/nvidia.nix +++ b/system-modules/nvidia.nix @@ -57,11 +57,10 @@ lib.mkIf nvidia.enable nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.beta; }; - opengl = { + package = config.boot.kernelPackages.nvidiaPackages.beta; + }; + graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; }; }; } diff --git a/system-modules/ollama.nix b/system-modules/ollama.nix index 284f5cd..3927290 100755 --- a/system-modules/ollama.nix +++ b/system-modules/ollama.nix @@ -19,7 +19,8 @@ in { package = p; enable = true; acceleration = lib.mkIf nvidia.enable "cuda"; - listenAddress = if host == "NxACE" then "0.0.0.0:11434" else "127.0.0.1:11434"; + host = if host == "NxACE" then "0.0.0.0" else "127.0.0.1"; + port = 11434; environmentVariables = { OLLAMA_ORIGINS = "*"; }; From a82660b049a6b3a4786e726d515917235ff19a40 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:59:20 +0100 Subject: [PATCH 06/15] Gimp --- home-modules/gimp.nix | 9 +++++++++ home.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100755 home-modules/gimp.nix diff --git a/home-modules/gimp.nix b/home-modules/gimp.nix new file mode 100755 index 0000000..4ed7ca4 --- /dev/null +++ b/home-modules/gimp.nix @@ -0,0 +1,9 @@ +{ pkgs, lib, host, ... }: +{ + home.packages = with pkgs; [ + (gimp-with-plugins.override { + plugins = with gimpPlugins; [ bimp ]; + }) + ]; +} + diff --git a/home.nix b/home.nix index ce74e4c..e11780e 100755 --- a/home.nix +++ b/home.nix @@ -14,6 +14,7 @@ # ./home-modules/foot.nix ./home-modules/games.nix ./home-modules/gestures.nix + ./home-modules/gimp.nix ./home-modules/git.nix ./home-modules/gpg.nix ./home-modules/gtk.nix @@ -103,7 +104,6 @@ ]) ++ (if host != "NxACE" then (with pkgs; [ signal-desktop zoom-us - gimp inkscape ]) else (with pkgs-unstable; [ From f5538e69a5a3569527ef11f93fd0123fc997f626 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 21:00:01 +0100 Subject: [PATCH 07/15] better color changing (maual) --- home-modules/color-pallete.nix | 33 ++-- home-modules/hyprland.nix | 8 +- home-modules/wallpaper-to-colors.nix | 253 ++++++++++++++------------- 3 files changed, 150 insertions(+), 144 deletions(-) diff --git a/home-modules/color-pallete.nix b/home-modules/color-pallete.nix index b8731de..ea4696c 100644 --- a/home-modules/color-pallete.nix +++ b/home-modules/color-pallete.nix @@ -5,17 +5,18 @@

${color-name}.dark

+

${color-set.dark}

${color-name}.base

+

${color-set.base}

${color-name}.bright

+

${color-set.bright}

''; - - in /* html */ '' @@ -37,7 +38,7 @@ color: ${foreground}; width: fit-content; margin: 10px auto 10px auto; - background: ${background}; + background: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}); border: ${builtins.toString rice.border-width}px solid ${border}; border-radius: ${builtins.toString rice.rounding}px; padding: ${builtins.toString rice.gap-size}px; @@ -66,18 +67,20 @@ ${cb accent "accent" 100} ${cb secondary "secondary" 100} ${cb tertiary "tertiary" 100} - ${cb weird "weird" 75} - ${cb special "special" 75} - ${cb positive "positive" 30} - ${cb negative "negative" 30} - ${cb black "black" 25} - ${cb white "white" 25} - ${cb blue "blue" 25} - ${cb cyan "cyan" 25} - ${cb green "green" 25} - ${cb magenta "magenta" 25} - ${cb red "red" 25} - ${cb yellow "yellow" 25} + ${cb weird "weird" 100} + ${cb special "special" 100} +
+ ${cb positive "positive" 70} + ${cb negative "negative" 70} +
+ ${cb black "black" 50} + ${cb white "white" 50} + ${cb blue "blue" 50} + ${cb cyan "cyan" 50} + ${cb green "green" 50} + ${cb magenta "magenta" 50} + ${cb red "red" 50} + ${cb yellow "yellow" 50}