diff --git a/flake.lock b/flake.lock index 3ed83fb..1fec7f0 100644 --- a/flake.lock +++ b/flake.lock @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1768912518, - "narHash": "sha256-FJlof1jnbLIT5RbKxef/NV6RzcOj1GoMzXE4FcBFg5Y=", + "lastModified": 1770586272, + "narHash": "sha256-Ucci8mu8QfxwzyfER2DQDbvW9t1BnTUJhBmY7ybralo=", "owner": "nix-community", "repo": "home-manager", - "rev": "9c5f8aceb6ef620e881f50fe65cb4a2c6b1e8527", + "rev": "b1f916ba052341edc1f80d4b2399f1092a4873ca", "type": "github" }, "original": { @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1768434960, - "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", + "lastModified": 1769872935, + "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", + "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", "type": "github" }, "original": { @@ -294,11 +294,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1768835187, - "narHash": "sha256-6nY0ixjGjPQCL+/sUC1B1MRiO1LOI3AkRSIywm3i3bE=", + "lastModified": 1769548169, + "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "0d633a69480bb3a3e2f18c080d34a8fa81da6395", + "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "type": "github" }, "original": { @@ -470,11 +470,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -573,11 +573,11 @@ ] }, "locked": { - "lastModified": 1768863606, - "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=", + "lastModified": 1770526836, + "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2", + "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768744881, - "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", + "lastModified": 1770587906, + "narHash": "sha256-N9ZTG3ia7l4iQO+9JlOj+sX4yu6gl7a3aozrlhSIJwQ=", "owner": "danth", "repo": "stylix", - "rev": "06684f00cfbee14da96fd4307b966884de272d3a", + "rev": "72e6483a88d51471a6c55e1d43e7ed2bc47a76a4", "type": "github" }, "original": { @@ -794,11 +794,11 @@ ] }, "locked": { - "lastModified": 1768857659, - "narHash": "sha256-93pj/A2s26CUZwvCpN0CL6a1NhLpYVzidzc/Vk2GKCI=", + "lastModified": 1770568363, + "narHash": "sha256-RJ/C24wN7LyuMmBgvIutA/PqXXceZtJtUCuZSaTjF/4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3a42efe341d068f13ffb961ed832474128b844f3", + "rev": "2ada8a826ea88512387a5a17ee96f16369bcdd80", "type": "github" }, "original": { diff --git a/hosts/musk/configuration.nix b/hosts/musk/configuration.nix index b9868c3..01c73a2 100644 --- a/hosts/musk/configuration.nix +++ b/hosts/musk/configuration.nix @@ -58,7 +58,7 @@ in { mods.boot.enable = true; mods.theme.enable = true; - mods.theme.scheme = "woodland"; + mods.theme.scheme = "catppuccin-macchiato"; mods.theme.wallpaper = ./wallpaper.png; services.xserver.windowManager.i3.enable = true; @@ -77,10 +77,10 @@ in { }; # Hardware preferences - environment.variables = { - WINIT_HIDPI_FACTOR = "1"; - WINIT_X11_SCALE_FACTOR = "1"; - }; + # environment.variables = { + # WINIT_HIDPI_FACTOR = "1"; + # WINIT_X11_SCALE_FACTOR = "1"; + # }; ## Monitors mods.monitors = { diff --git a/hosts/musk/home.nix b/hosts/musk/home.nix index 0bd1d49..d9b4d22 100644 --- a/hosts/musk/home.nix +++ b/hosts/musk/home.nix @@ -7,6 +7,7 @@ ... }: let cfg = osConfig.mods; + color = config.lib.stylix.colors.withHashtag; in { # Modules mods.xdg.enable = true; @@ -45,6 +46,20 @@ in { # Non-free /tmp/ss.png;if [ ! -s /tmp/ss.png ]; then - exit 1 - fi - AUTH=$(cat ${config.sops.secrets.zipline-auth.path}) - curl -H "authorization: $AUTH" https://share.muon.host/api/upload -F file=@/tmp/ss.png -H "Content-Type: multipart/form-data" -H "Format: date" -H "Image-Compression-Percent: 90" -H "No-JSON: true" | tr -d '\n' | xsel -ib; - ''; - }; zmenu = with pkgs; writeShellApplication { name = "zmenu"; @@ -155,8 +143,10 @@ in // { "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume 0 +2%"; "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume 0 -2%"; - "Print" = "exec ${getExe fsss}"; + "Print" = "exec flameshot gui -c -s"; "${modifier}+z" = "exec ${getExe zmenu}"; + "${modifier}+p" = "exec clipmenu"; + "${modifier}+b" = "exec ${getExe pkgs.rofi-rbw-x11}"; "${modifier}+y" = "sticky toggle"; "${modifier}+g" = "floating toggle"; }); diff --git a/modules/home/desktop/productivity.nix b/modules/home/desktop/productivity.nix index f18c5b5..cb240d4 100644 --- a/modules/home/desktop/productivity.nix +++ b/modules/home/desktop/productivity.nix @@ -48,12 +48,12 @@ in programs.zsh.sessionVariables.BROWSER = "librewolf"; services.flameshot = { - enable = false; + enable = true; settings = { General = { disabledTrayIcon = true; showStartupLaunchMessage = false; - startupLaunch = false; + startupLaunch = true; uiColor = color.base01; contrastUiColor = color.base00; diff --git a/modules/home/desktop/social.nix b/modules/home/desktop/social.nix index abc6c4b..544059f 100644 --- a/modules/home/desktop/social.nix +++ b/modules/home/desktop/social.nix @@ -20,6 +20,7 @@ in { abaddon vesktop-nogain # (callPackage ./packages/librediscord.nix {}) + jami # Video freetube @@ -29,5 +30,6 @@ in { ]; services.gnome-keyring.enable = true; + services.dunst.enable = true; }; } diff --git a/modules/home/terminal/nvim/default.nix b/modules/home/terminal/nvim/default.nix index 9ea251e..abbb69f 100644 --- a/modules/home/terminal/nvim/default.nix +++ b/modules/home/terminal/nvim/default.nix @@ -103,6 +103,7 @@ in { clipboard = { enable = true; providers.xclip.enable = true; + registers = "unnamed,unnamedplus"; }; mini = { diff --git a/modules/nixos/theme/default.nix b/modules/nixos/theme/default.nix index e9de1ce..0023f43 100644 --- a/modules/nixos/theme/default.nix +++ b/modules/nixos/theme/default.nix @@ -23,7 +23,8 @@ in { stylix = { enable = true; autoEnable = true; - base16Scheme = cfg.scheme; + # base16Scheme = cfg.scheme; + base16Scheme = ./synthwave84.yaml; image = cfg.wallpaper; cursor = { name = "phinger-cursors-light"; diff --git a/modules/nixos/theme/synthwave84.yaml b/modules/nixos/theme/synthwave84.yaml new file mode 100644 index 0000000..08be6c2 --- /dev/null +++ b/modules/nixos/theme/synthwave84.yaml @@ -0,0 +1,24 @@ +system: "base16" +name: "synthwave84" +slug: "synthwave84" +author: "Someone" +variant: "dark" +palette: + base00: "2a2139" + base01: "241b2f" + base02: "34294f" + base03: "8e6fe4" + base04: "c1c3e6" + base05: "f5f5ff" + base06: "ffffff" + base07: "fffdf8" + base08: "f92aad" + base09: "f97e72" + base0A: "ffe261" + base0B: "72f1b8" + base0C: "78dcff" + base0D: "36f9f6" + base0E: "ff7edb" + base0F: "bb8977" + + diff --git a/shell.nix b/shell.nix index 5d84124..ffc8955 100644 --- a/shell.nix +++ b/shell.nix @@ -1,7 +1,6 @@ -{ pkgs ? import { }, ... }: { +{pkgs ? import {}, ...}: { default = pkgs.mkShell { - NIX_CONFIG = - "extra-experimental-features = nix-command flakes ca-derivations"; + NIX_CONFIG = "extra-experimental-features = nix-command flakes ca-derivations"; nativeBuildInputs = with pkgs; [ nix git