diff --git a/flake.lock b/flake.lock index bd16a7c..a0ba691 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1743774811, - "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1744663884, - "narHash": "sha256-a6QGaZMDM1miK8VWzAITsEPOdmLk+xTPyJSTjVs3WhI=", + "lastModified": 1742530487, + "narHash": "sha256-yjBjRn294NpPagPAQCio20X5BzBXiOoz2+xF3/YmEkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5cdf55bd9f19a3debd55b6cb5d38f7831426265", + "rev": "d61711497be9ad6a6633aaf203b038b5a970621f", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1741635347, + "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", "type": "github" }, "original": { @@ -368,14 +368,14 @@ "flake": false, "locked": { "lastModified": 1737234286, - "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", - "rev": "079528098f5998ba13c88821a2eca1005c1695de", + "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", + "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" } }, "lix-module": { @@ -388,15 +388,15 @@ ] }, "locked": { - "lastModified": 1742943028, - "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", - "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", + "lastModified": 1737237494, + "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", + "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" } }, "niri": { @@ -411,11 +411,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744705923, - "narHash": "sha256-ch+j1T4FDMuj3Jm0ALOSS4vpyQZsHQmWO8hkVXOL+nY=", + "lastModified": 1743943715, + "narHash": "sha256-9xCTf79Naq7mxvqtjgbcU9ZlNwubAep0qlwrL3GqZQQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1e6d8e177cfc614c35252bd57f0ad7a64833aaa3", + "rev": "f53eac2ea3c72dd4e9739228660f661eb27359d0", "type": "github" }, "original": { @@ -444,11 +444,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1744475937, - "narHash": "sha256-vJXhE2BCJO3AxGUGqL7GW7ReeAL+OKy80ErMYDuILjM=", + "lastModified": 1743923080, + "narHash": "sha256-Hb3t6FoJycnqIZmu3c6K1bJGndBsrDw8IQtM2ieLbzU=", "owner": "YaLTeR", "repo": "niri", - "rev": "95eafba346a17104a9af71021011fcdc9e13776b", + "rev": "430b155929a60644ea223012ee0c1389fc5e3755", "type": "github" }, "original": { @@ -459,11 +459,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -474,11 +474,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1743813633, + "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744669903, - "narHash": "sha256-gtfLmGx/N+BzIck9sGLIfzETxocYjVKo4gmSeH6zfaY=", + "lastModified": 1742488644, + "narHash": "sha256-vXpu7G4aupNCPlv8kAo7Y/jocfSUwglkvNx5cR0XjBo=", "owner": "nix-community", "repo": "nixvim", - "rev": "ee9655637cbf898415e09c399bc504180e246d42", + "rev": "d44b33a1ea1a3e584a8c93164dbe0ba2ad4f3a13", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743884191, - "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", + "lastModified": 1741693509, + "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", "owner": "nix-community", "repo": "NUR", - "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", + "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", "type": "github" }, "original": { @@ -543,11 +543,11 @@ ] }, "locked": { - "lastModified": 1743683223, - "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", + "lastModified": 1741886583, + "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", "owner": "NuschtOS", "repo": "search", - "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", + "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", "type": "github" }, "original": { @@ -574,11 +574,11 @@ ] }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1742406979, + "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "type": "github" }, "original": { @@ -611,11 +611,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1744668092, - "narHash": "sha256-XDmpI3ywMkypsHKRF2am6BzZ5OjwpQMulAe8L87Ek8U=", + "lastModified": 1742496983, + "narHash": "sha256-UpJrU0DEhNLVZwL/RPVOEUHCG6iDOVDoYelkmgS4V38=", "owner": "danth", "repo": "stylix", - "rev": "38aff11a7097f4da6b95d4c4d2c0438f25a08d52", + "rev": "7e9906679d384472849272e5a5eef7adbdb1d87f", "type": "github" }, "original": { @@ -706,11 +706,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1742851696, - "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", + "lastModified": 1741468895, + "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", "owner": "tinted-theming", "repo": "schemes", - "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", + "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", "type": "github" }, "original": { @@ -722,11 +722,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1743296873, - "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", + "lastModified": 1740877430, + "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", + "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", "type": "github" }, "original": { @@ -793,11 +793,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1744685222, - "narHash": "sha256-ocJQcrr0IQuumaTd9HHH6gtLYmQvJioxFs+dmnySnlw=", + "lastModified": 1743346993, + "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "45185b7f142c153ce3ab50bbc196b2112e0797c2", + "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 61b50b5..78278ab 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ }; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -72,16 +72,13 @@ muhhStar = lib.nixosSystem { inherit system; modules = [ - lix-module.nixosModules.default sops-nix.nixosModules.sops - niri.nixosModules.niri ./hosts/muhhStar.nix ]; }; ze = lib.nixosSystem { inherit system; modules = [ - lix-module.nixosModules.default sops-nix.nixosModules.sops ./hosts/ze.nix ]; diff --git a/home.nix b/home.nix index 7cd41c1..964cc6b 100644 --- a/home.nix +++ b/home.nix @@ -3,9 +3,7 @@ imports = [ modules/gnome modules/niri - modules/sops modules/sway - modules/waybar ]; home = { @@ -64,15 +62,14 @@ spot sxiv steam-run - sway-launcher-desktop tmux - uni unzip via wget whois wl-clipboard wl-mirror + sway-launcher-desktop vivaldi xdg-utils zellij @@ -464,6 +461,80 @@ enable = true; enableFishIntegration = true; }; + waybar = { + enable = true; + systemd.enable = true; + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 24; + spacing = 3; + output = [ "DP-1" ]; + modules-left = [ + "sway/workspaces" + "sway/mode" + "sway/scratchpad" + "sway/window" + "custom/media" + ]; + modules-center = [ + "clock" + "idle_inhibitor" + ]; + modules-right = [ + "pulseaudio" + "backlight" + "network" + "tray" + "custom/notification" + "custom/power" + ]; + "sway/scratchpad" = { + format = "{icon} {count}"; + show-empty = false; + format-icons = ["" ""]; + tooltip = true; + tooltip-format = "{app}: {title}"; + }; + "backlight" = { + device = "ddcci6"; + format = "{percent}% {icon}"; + format-icons = [ "" "" "" "" "" "" ""]; + }; + "clock" = { + format = "{:%d. %B | %H:%M}"; + tooltip-format = "{:%Y %B}\n{calendar}"; + format-alt = "{: KW %OV, %A, %d. %B %Y | %H:%M}"; + calendar = { + mode = "year"; + mode-mon-col = 3; + weeks-pos = "right"; + on-scroll = 1; + on-click-right = "mode"; + format = { + months = "{}"; + days = "{}"; + weeks = "W{}"; + weekdays = "{}"; + today = "{}"; + }; + }; + "actions" = { + on-click-right = "mode"; + on-click-forward = "tz_up"; + on-click-backward = "tz_down"; + on-scroll-up = "shift_up"; + on-scroll-down = "shift_down"; + }; + }; + "tray" = { + icon-size = 16; + spacing = 6; + }; + }; + }; + }; yazi = { enable = true; enableFishIntegration = true; @@ -488,33 +559,41 @@ }; }; + sops = { + age.keyFile = "${config.xdg.configHome}/sops/age/keys.txt"; + defaultSopsFile = ./secrets/secrets.yaml; + secrets = { + atuin_key = {}; + "mail/privat/address" = {}; + "mail/privat/username" = {}; + "mail/privat/password" = {}; + "mail/icloud/address" = {}; + "mail/icloud/username" = {}; + "mail/icloud/password" = {}; + }; + }; + stylix = { enable = true; image = /home/muhh/Sync/Backgrounds/wald.jpg; - polarity = "either"; + polarity = "dark"; # base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; # base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-city-terminal-dark.yaml"; - # base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml"; - # base16Scheme = ./share/themes/flexoki-light.yaml; - base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-dawn.yaml"; + #base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml"; + base16Scheme = ./share/themes/flexoki-light.yaml; cursor = { - name = "BreezeX-RosePine-Linux"; + name = "Rosé Pine"; package = pkgs.rose-pine-cursor; - size = 32; + size = 48; }; fonts = { monospace = { package = pkgs.nerd-fonts.iosevka; name = "Iosevka Nerd Font"; - }; - sansSerif = { - package = pkgs.atkinson-hyperlegible; - name = "Atkinson Hyperlegible"; + # package = pkgs.atkinson-monolegible; + # name = "Atkinson Monolegible"; }; sizes = { - applications = 14; - desktop = 10; - popups = 10; terminal = 14; }; }; diff --git a/hosts/cube.nix b/hosts/cube.nix index 7ba72df..eae655c 100644 --- a/hosts/cube.nix +++ b/hosts/cube.nix @@ -53,43 +53,19 @@ nssmdns4 = true; openFirewall = true; }; - # services.borgmatic = { - # enable = true; - # configurations = { - # test = { - # source_directories = [ - # "/home/muhh/muhhmory" - # ]; - # repositories = [ - # "ssh://u455876@u455876.your-storagebox.de/./test" - # ]; - # }; - # storage = { - # extraConfig = { - # ssh_command = "ssh -p 23 -i ~/.ssh/id_ed25519"; - # }; - # }; - # }; - # }; - # }; services.envfs.enable = true; - services.xserver = { - xkb.layout = "eu"; - xkb.options = "compose:ralt"; - displayManager = { - gdm = { - enable = true; - }; + services.xserver.displayManager = { + gdm = { + enable = true; + }; + }; + services.displayManager = { + # defaultSession = "niri"; + ly = { + enable = false; + settings = {}; }; - desktopManager.gnome.enable = true; }; - # services.displayManager = { - # # defaultSession = "niri"; - # ly = { - # enable = false; - # settings = {}; - # }; - # }; services.flatpak.enable = true; services.fwupd.enable = true; @@ -116,11 +92,6 @@ }; services.jellyfin = { enable = true; - openFirewall = true; - }; - services.miniflux = { - enable = true; - adminCredentialsFile = "/etc/nixos/miniflux-admin-credentials"; }; services.tailscale = { @@ -128,12 +99,15 @@ authKeyFile = config.sops.secrets.tailscale_auth_key.path; }; - sops = { - age.keyFile = "/home/muhh/.config/sops/age/keys.txt"; - defaultSopsFile = ../modules/sops/secrets/secrets.yaml; - secrets.tailscale_auth_key = {}; + # Configure keymap in X11 + services.xserver = { + xkb.layout = "eu"; + xkb.options = "compose:ralt"; }; + sops.defaultSopsFile = ../secrets/secrets.yaml; + sops.age.keyFile = "/home/muhh/.config/sops/age/keys.txt"; + sops.secrets.tailscale_auth_key = {}; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.muhh = { isNormalUser = true; @@ -154,9 +128,6 @@ evolutionWithPlugins git home-manager - jellyfin - jellyfin-ffmpeg - jellyfin-web mosh toolbox vim diff --git a/justfile b/justfile index 44fbac5..f78440c 100644 --- a/justfile +++ b/justfile @@ -1,4 +1,4 @@ -SOPS_FILE := "./modules/sops/secrets/secrets.yaml" +SOPS_FILE := "./secrets/secrets.yaml" default: @just --list diff --git a/modules/borgmatic/default.nix b/modules/borgmatic/default.nix deleted file mode 100644 index 553be86..0000000 --- a/modules/borgmatic/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - programs.borgmatic = { - enable = true; - backups = { - test = { - location = { - sourceDirectories = [ - "/home/muhh/muhhmory" - ]; - repositories = [ - "ssh://u455876@u455876.your-storagebox.de/./test" - ]; - }; - storage = { - extraConfig = { - ssh_command = "ssh -p 23 -i ~/.ssh/id_ed25519"; - }; - }; - }; - }; - }; -} diff --git a/modules/sops/default.nix b/modules/sops/default.nix deleted file mode 100644 index 16edacc..0000000 --- a/modules/sops/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ inputs, pkgs, config, home, ... }: { - # imports = [ - # inputs.sops.homeManagerModules.sops - # ]; - - home.packages = with pkgs; [ - sops - ]; - - sops = { - age.keyFile = "${config.xdg.configHome}/sops/age/keys.txt"; - defaultSopsFile = ./secrets/secrets.yaml; - secrets = { - atuin_key = {}; - "mail/privat/address" = {}; - "mail/privat/username" = {}; - "mail/privat/password" = {}; - "mail/icloud/address" = {}; - "mail/icloud/username" = {}; - "mail/icloud/password" = {}; - tailscale_auth_key = {}; - }; - }; -} diff --git a/modules/sway/default.nix b/modules/sway/default.nix index c035200..ed9b3b6 100644 --- a/modules/sway/default.nix +++ b/modules/sway/default.nix @@ -92,7 +92,7 @@ }; HDMI-A-1 = { resolution = "1920x1080@60.000Hz"; - transform = "flipped"; + transform = "180"; position = "0 0"; scale = "1.5"; # background = "/home/muhh/Sync/Backgrounds/pfuetze.jpg fill"; diff --git a/modules/waybar/default.nix b/modules/waybar/default.nix deleted file mode 100644 index 236d297..0000000 --- a/modules/waybar/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - programs.waybar = { - enable = true; - systemd.enable = true; - settings = { - mainBar = { - layer = "top"; - position = "top"; - height = 18; - spacing = 2; - output = [ "DP-1" ]; - modules-left = [ - "sway/workspaces" - "sway/mode" - "sway/scratchpad" - "sway/window" - "custom/media" - ]; - modules-center = [ - "clock" - "idle_inhibitor" - ]; - modules-right = [ - "pulseaudio" - "backlight" - "network" - "tray" - "custom/notification" - "custom/power" - ]; - "sway/scratchpad" = { - format = "{icon} {count}"; - show-empty = false; - format-icons = ["" ""]; - tooltip = true; - tooltip-format = "{app}: {title}"; - }; - "backlight" = { - device = "ddcci6"; - format = "{percent}% {icon}"; - format-icons = [ "" "" "" "" "" "" ""]; - }; - "clock" = { - format = "{:%d. %B | %H:%M}"; - tooltip-format = "{:%Y %B}\n{calendar}"; - format-alt = "{: KW %OV, %A, %d. %B %Y | %H:%M}"; - calendar = { - mode = "year"; - mode-mon-col = 3; - weeks-pos = "right"; - on-scroll = 1; - on-click-right = "mode"; - format = { - months = "{}"; - days = "{}"; - weeks = "W{}"; - weekdays = "{}"; - today = "{}"; - }; - }; - "actions" = { - on-click-right = "mode"; - on-click-forward = "tz_up"; - on-click-backward = "tz_down"; - on-scroll-up = "shift_up"; - on-scroll-down = "shift_down"; - }; - }; - "tray" = { - icon-size = 16; - spacing = 2; - }; - }; - }; - }; -} diff --git a/modules/sops/secrets/secrets.yaml b/secrets/secrets.yaml similarity index 80% rename from modules/sops/secrets/secrets.yaml rename to secrets/secrets.yaml index bc7f5e3..d00ef4a 100644 --- a/modules/sops/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -4,12 +4,16 @@ mail: privat: address: ENC[AES256_GCM,data:MdODBjT/vGmoZidXYppWX0EN,iv:Ai2YVodb/vOEyCK2spnH1vwPJrdvqIHM40ZGhALHq8A=,tag:ge1dIDEgiSYVJGNwuq+qKw==,type:str] username: ENC[AES256_GCM,data:492WNo3Dw9hFMUnVEGW/Cd6L,iv:WWbO8gX9kqiFsNGYPnp44m52fMkeHojiSXGhcl2a3wM=,tag:fILTYxn3QY1xvwLuU8EdSQ==,type:str] - password: ENC[AES256_GCM,data:4IF7J2guSYK1XH5h10McaIYuLl6hDMvsAed/qa90BpzQG1L08gIq6Q==,iv:lI6vRYxyFIAWJ+1/uT5tc8msbvlpWcjUe+0FQxSFqVI=,tag:dXjnKxdt7LuDsHIT0a1jFw==,type:str] + password: ENC[AES256_GCM,data:Oa3tYztCeY0Nvun+34bAji+9b/g=,iv:Sbx/d2H35wlPvsfomwAF+aT3kBCV70+GDi0Lj5lqTII=,tag:xHC6yGlsTroja8CMOTx/rQ==,type:str] icloud: address: ENC[AES256_GCM,data:7/4rd1ZneKI02kw=,iv:bBUrG3j+S3FGFGHPfbaSi7WnuVS9hliZU4Bxw1MrWDU=,tag:7C8T3artkNO68EctuBhb2A==,type:str] username: ENC[AES256_GCM,data:dP/Ft1dlbqxHJC0=,iv:it+Z+ALPGOc7ZyYqrtgiZxuL+pPptmDaT4Obh2XArPA=,tag:0Z7Ll/4iBHN51KKSyN8kpw==,type:str] password: ENC[AES256_GCM,data:KL+QQemQ9z2Le2o=,iv:3J+Qx4uknKVlNrB4EqP8orxa8IrLEgT8MDa68JrPUeI=,tag:gNVr9ohICAgOHSMwIlcsmA==,type:str] sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] age: - recipient: age1awjelu4fqh5jyc49p3sujn0wc7zdz9xmj2aajaz7mp5fkwwtj4uqyp8fl8 enc: | @@ -29,7 +33,8 @@ sops: SEFxb2UwbDFiSG5QdzVWRk02b3lIZDQKYF4Vv3FwvKv3uwACRXb/jwD6Q5rh39Yu w7J86gsX7Yh9Wm65y+CW1JE8EN72mhBbYwve3lK8twDjxmLhYOMjIg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-04-09T15:10:07Z" - mac: ENC[AES256_GCM,data:s4Y8A99KC0gh3mJ/F9mh6XFE9dRznJlH5RDwzC+ne7rQjT6oauT3a79DWqVSgZlH+BsBNkwx+1RykSS5XAUy4wXa1caI1GtG+scoyonJ4Az9/j+8iqIs5uE6dEGEi5lyEhoo0Kwt7UVtcUvnoHZPtEtm9CNjbY+1vZ1hpqAjg04=,iv:JWQ+EYc2d9z58ZsgYC39xsSF5Lroh8sDkTJF1PilHM4=,tag:y1YqksD5cemunTAge9PLmQ==,type:str] + lastmodified: "2024-05-22T07:53:28Z" + mac: ENC[AES256_GCM,data:T0gcJp4lIFyEkseXovSRlBYunlLNTE4yYJmD203brJ0GuQ50pOyJbbwjTaQF/4LQ4w6qgnE4/Yim5L0moXWGkWdyyvrwT2Ln69hFKnbQxHCfiTVgWF4fMTT0qaLOZgd+KKPnUuObeaPWbzkZVya72LAWvDd34KgRhVAvrQsoRVg=,iv:zJYE3iQbZCOigYxOJDf9Chd6JIxOiR8Nn429SSOqWQw=,tag:XmB0ah3HwX+SaC0m6XKENA==,type:str] + pgp: [] unencrypted_suffix: _unencrypted - version: 3.10.1 + version: 3.8.1 diff --git a/sops.nix b/sops.nix new file mode 100644 index 0000000..6826f50 --- /dev/null +++ b/sops.nix @@ -0,0 +1,10 @@ +{ inputs, pkgs, ... }: { + # imports = [ + # inputs.sops.homeManagerModules.sops + # ]; + + home.packages = with pkgs; [ + sops + ]; + +}