diff --git a/flake.lock b/flake.lock index a1d8fe9..e8e1777 100644 --- a/flake.lock +++ b/flake.lock @@ -11,14 +11,15 @@ ], "nixpkgs-wine": "nixpkgs-wine", "on-linux": "on-linux", + "plugin-loader": "plugin-loader", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1762586244, - "narHash": "sha256-po6o2DqL4WcTzKR3xGf2djajkKNipeQEFVPiaSwjGmg=", + "lastModified": 1763155533, + "narHash": "sha256-/oz0XxqBTOe9Bk7MsPYs73+Ajto051/WneYbyg/+5nU=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "a71b769b0a5d53b15ea9df0f5ed37280f82575e3", + "rev": "fe613cf7ee29d5344dfdead3fc779b45fb578015", "type": "github" }, "original": { @@ -34,11 +35,11 @@ ] }, "locked": { - "lastModified": 1762703198, - "narHash": "sha256-oO79wRdwgOPPYTka0GzlPTkF/f9oDPJngi7WcaMM2a0=", + "lastModified": 1763546214, + "narHash": "sha256-vc9seqvw2ElF8jPetsCoCQ5lo9P3fmgiTle3HlOMezk=", "owner": "AdnanHodzic", "repo": "auto-cpufreq", - "rev": "41b41638ebce8a1a81efb4c5182524b28d092f1c", + "rev": "76ccb66f8e4875671fd746fb6b50931454ab8cd8", "type": "github" }, "original": { @@ -142,11 +143,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1762920261, - "narHash": "sha256-VuUg2EP2Y0QrDTsDP6/3kN3Hurn6HfyMW3rGzdruhW8=", + "lastModified": 1763525054, + "narHash": "sha256-QSXJQHYhqA2hljDBZaMpfDU85TNjyGAmIMZMbb/JhO4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "8cd76837f50debe28b51820adb00b522df8ade91", + "rev": "319f82d4733249c8c6e20f7723caca2bf53f540c", "type": "gitlab" }, "original": { @@ -300,18 +301,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "host": "gitlab.gnome.org", + "lastModified": 1762869044, + "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" + "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.2", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -321,11 +324,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -369,11 +372,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762844143, - "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -409,8 +412,8 @@ }, "original": { "owner": "nixos", - "ref": "6df24922a1400241dae323af55f30e4318a6ca65", "repo": "nixpkgs", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" } }, @@ -454,6 +457,18 @@ "type": "github" } }, + "plugin-loader": { + "flake": false, + "locked": { + "narHash": "sha256-CCqT6TQHG7HqvxsnP/EC9Mg6A3KfNg5i/vGXW0exTxU=", + "type": "file", + "url": "https://github.com/noahc3/AffinityPluginLoader/releases/latest/download/affinitypluginloader-plus-winefix.tar.xz" + }, + "original": { + "type": "file", + "url": "https://github.com/noahc3/AffinityPluginLoader/releases/latest/download/affinitypluginloader-plus-winefix.tar.xz" + } + }, "prismlauncher-cracked": { "inputs": { "libnbtplusplus": "libnbtplusplus", @@ -508,11 +523,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1762264356, - "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", + "lastModified": 1763578087, + "narHash": "sha256-NUTbu1mA8Rc4HBxYDyuS6moYix8kSNoWa8g7LAH9onE=", "owner": "danth", "repo": "stylix", - "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", + "rev": "ab29ae14d782a689ed07dcb6459acc1d20ce0908", "type": "github" }, "original": { diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 6748b44..46a1ba3 100644 --- a/modules/core/boot.nix +++ b/modules/core/boot.nix @@ -1,4 +1,9 @@ -{ pkgs, config, ... }: +{ + pkgs, + config, + lib, + ... +}: { boot = { @@ -16,7 +21,7 @@ wallpapers = [ ./../../wallpapers/attack-on-titan-mikasa-ackerman.jpg ]; - wallpaperStyle = "centered"; + wallpaperStyle = lib.mkDefault "centered"; backdrop = "${config.stylix.base16Scheme.base00}"; interface = { branding = "GarandOS Bootloader"; diff --git a/modules/core/default.nix b/modules/core/default.nix index ff0f0a5..421af3a 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -24,6 +24,7 @@ ./thunar.nix ./user.nix ./virtualisation.nix + ./xdg.nix ./xserver.nix inputs.stylix.nixosModules.stylix ]; diff --git a/modules/core/flatpak.nix b/modules/core/flatpak.nix index a415120..b8e83d2 100644 --- a/modules/core/flatpak.nix +++ b/modules/core/flatpak.nix @@ -1,19 +1,9 @@ -{ pkgs, ... }: -{ - xdg.portal = { - enable = true; - wlr.enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-hyprland - xdg-desktop-portal-gtk - ]; - configPackages = [ pkgs.hyprland ]; - }; +_: { services = { flatpak = { enable = true; packages = [ - "org.vinegarhq.Sober" + # "org.vinegarhq.Sober" "io.github.flattool.Warehouse" "com.github.tchx84.Flatseal" ]; diff --git a/modules/core/packages/clients.nix b/modules/core/packages/clients.nix index 4de0b63..21c91fc 100644 --- a/modules/core/packages/clients.nix +++ b/modules/core/packages/clients.nix @@ -5,10 +5,10 @@ slack mattermost-desktop # Productivity & Office - bitwarden-desktop + # bitwarden-desktop tutanota-desktop iotas - logseq + # logseq # Utilities galculator gedit diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index 0a13224..56565b9 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -4,7 +4,7 @@ imports = [ ./programs.nix ./clients.nix - ./development.nix + # ./development.nix ./gaming.nix ./multimedia.nix ./terminal.nix diff --git a/modules/core/packages/development.nix b/modules/core/packages/development.nix index 7f7adc4..fffe526 100644 --- a/modules/core/packages/development.nix +++ b/modules/core/packages/development.nix @@ -1,10 +1,6 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ - # Language servers & formatters - nixd - nil - nixfmt-rfc-style # Learning & practice exercism ]; diff --git a/modules/core/packages/gaming.nix b/modules/core/packages/gaming.nix index fb65545..72dd1b9 100644 --- a/modules/core/packages/gaming.nix +++ b/modules/core/packages/gaming.nix @@ -1,12 +1,12 @@ { pkgs, - inputs, - system, + # inputs, + # system, ... }: { environment.systemPackages = with pkgs; [ - inputs.prismlauncher-cracked.packages.${system}.default + # inputs.prismlauncher-cracked.packages.${system}.default space-cadet-pinball tty-solitaire ]; diff --git a/modules/core/packages/multimedia.nix b/modules/core/packages/multimedia.nix index 0df5f2c..06059ec 100644 --- a/modules/core/packages/multimedia.nix +++ b/modules/core/packages/multimedia.nix @@ -1,7 +1,7 @@ { pkgs, - inputs, - system, + # inputs, + # system, ... }: { @@ -11,9 +11,9 @@ ffmpegthumbnailer mpv # gimp3 - inputs.affinity-nix.packages.${system}.v3 + # inputs.affinity-nix.packages.${system}.v3 eog - kdePackages.kdenlive + # kdePackages.kdenlive # Audio rhythmbox plexamp @@ -21,7 +21,7 @@ pavucontrol playerctl # Media downloaders & clients - freetube - ytmdl + # freetube + # ytmdl ]; } diff --git a/modules/core/packages/terminal.nix b/modules/core/packages/terminal.nix index ad8ca01..83164ac 100644 --- a/modules/core/packages/terminal.nix +++ b/modules/core/packages/terminal.nix @@ -7,6 +7,5 @@ fortune lolcat eza - amfora ]; } diff --git a/modules/core/packages/virtualization.nix b/modules/core/packages/virtualization.nix index 384ca61..7be533a 100644 --- a/modules/core/packages/virtualization.nix +++ b/modules/core/packages/virtualization.nix @@ -2,11 +2,11 @@ { environment.systemPackages = with pkgs; [ virt-viewer - lazydocker + # lazydocker docker-client - distrobox - boxbuddy - freerdp - winboat + # distrobox + # boxbuddy + # freerdp + # winboat ]; } diff --git a/modules/core/xdg.nix b/modules/core/xdg.nix new file mode 100644 index 0000000..7862464 --- /dev/null +++ b/modules/core/xdg.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +{ + xdg.portal = { + enable = true; + wlr.enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-hyprland + xdg-desktop-portal-gtk + ]; + configPackages = [ pkgs.hyprland ]; + }; +} diff --git a/modules/home/amfora.nix b/modules/home/amfora.nix deleted file mode 100644 index 4c4a941..0000000 --- a/modules/home/amfora.nix +++ /dev/null @@ -1,107 +0,0 @@ -_: { - home.file = { - ".config/amfora/config.toml".text = '' - [a-general] - home = "gemini://gem.zaney.org" - color = true - ansi = true - bullets = true - show_link = false - scrollbar = "never" - auto_redirect = false - http = 'brave' - search = "gemini://gus.guru/search" - max_width = 140 - page_max_size = 2097152 # 2 MiB - page_max_time = 10 - highlight_code = true - highlight_style = "dracula" - downloads = '~/Downloads/' - underline = true - [auth] - [auth.certs] - [auth.keys] - [commands] - [keybindings] - bind_bottom = ":" - bind_quit = "Q" - bind_reload = "R" - bind_back = "h" - bind_forward = "l" - bind_moveup = "k" - bind_movedown = "j" - bind_moveleft = "H" - bind_moveright = "L" - bind_next_tab = "J" - bind_prev_tab = "K" - bind_edit = "o" - bind_new_tab = "O" - bind_close_tab = "q" - bind_save = "S" - bind_home = "Ctrl-h" - bind_bookmarks = "b" - bind_add_bookmark = "B" - bind_copy_page_url = "c" - bind_copy_target_url = "C" - bind_search = "/" - bind_next_match = "n" - bind_prev_match = "N" - [url-handlers] - [url-prompts] - [cache] - max_size = 0 # Size in bytes - max_pages = 30 # The maximum number of pages the cache will store - timeout = 1800 # 30 mins - [proxies] - [subscriptions] - popup = true - update_interval = 1800 # 30 mins - workers = 3 - entries_per_page = 20 - header = true - [theme] - bg = "#282a36" - tab_num = "#bd93f9" - tab_divider = "#f8f8f2" - bottombar_label = "#bd93f9" - bottombar_text = "#8be9fd" - bottombar_bg = "#44475a" - scrollbar = "#44475a" - hdg_1 = "#bd93f9" - hdg_2 = "#7cafc2" - hdg_3 = "#a16946" - amfora_link = "#ff79c6" - foreign_link = "#ffb86c" - link_number = "#8be9fd" - regular_text = "#f8f8f2" - quote_text = "#f1fa8c" - preformatted_text = "#ffb86c" - list_text = "#f8f8f2" - btn_bg = "#44475a" - btn_text = "#f8f8f2" - dl_choice_modal_bg = "#6272a4" - dl_choice_modal_text = "#f8f8f2" - dl_modal_bg = "#6272a4" - dl_modal_text = "#f8f8f2" - info_modal_bg = "#6272a4" - info_modal_text = "#f8f8f2" - error_modal_bg = "#ff5555" - error_modal_text = "#f8f8f2" - yesno_modal_bg = "#6272a4" - yesno_modal_text = "#f8f8f2" - tofu_modal_bg = "#6272a4" - tofu_modal_text = "#f8f8f2" - subscription_modal_bg = "#6272a4" - subscription_modal_text = "#f8f8f2" - input_modal_bg = "#6272a4" - input_modal_text = "#f8f8f2" - input_modal_field_bg = "#44475a" - input_modal_field_text = "#f8f8f2" - bkmk_modal_bg = "#6272a4" - bkmk_modal_text = "#f8f8f2" - bkmk_modal_label = "#f8f8f2" - bkmk_modal_field_bg = "#44475a" - bkmk_modal_field_text = "#f8f8f2" - ''; - }; -} diff --git a/modules/home/bottom.nix b/modules/home/bottom.nix deleted file mode 100644 index 00793b1..0000000 --- a/modules/home/bottom.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ ... }: -{ - programs.bottom = { - enable = true; - settings = { - enable_gpu = true; - theme = "nord"; - flags.group_processes = true; - row = [ - { - ratio = 2; - child = [ - { type = "cpu"; } - { type = "temp"; } - ]; - } - { - ratio = 2; - child = [ - { type = "network"; } - ]; - } - { - ratio = 3; - child = [ - { - type = "proc"; - ratio = 1; - default = true; - } - ]; - } - ]; - }; - }; -} diff --git a/modules/home/cava.nix b/modules/home/cava.nix index 38a55d4..0791754 100644 --- a/modules/home/cava.nix +++ b/modules/home/cava.nix @@ -1,6 +1,6 @@ _: { programs.cava = { - enable = true; + enable = false; settings = { general = { bar_spacing = 1; diff --git a/modules/home/default.nix b/modules/home/default.nix index 05593da..02524d2 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -10,20 +10,17 @@ in ./scripts waybarChoice ./wlogout - ./amfora.nix ./anki.nix ./bash.nix ./bash-aliases.nix ./bash-functions.nix ./bat.nix ./btop.nix - ./bottom.nix ./cava.nix ./chromium.nix ./emoji.nix ./eza.nix ./fzf.nix - ./gh.nix ./git.nix ./gtk.nix ./kdeConnect.nix diff --git a/modules/home/gh.nix b/modules/home/gh.nix deleted file mode 100644 index 0df8cc3..0000000 --- a/modules/home/gh.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - programs = { - gh.enable = true; - }; -} diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index b788c62..27a9e8d 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -10,19 +10,14 @@ in # APLIKACJE - GŁÓWNE # ============================================================================= "$modifier, A, exec, anki" - "$modifier, B, exec, bitwarden" "$modifier, C, exec, chromium" "$modifier, D, exec, vesktop" - "$modifier, G, exec, affinity-v3" "$modifier, I, exec, iotas" - "$modifier, L, exec, logseq" "$modifier, M, exec, plexamp" "$modifier, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop" - "$modifier, O, exec, obs" "$modifier, Return, exec, ${terminal}" "$modifier, S, exec, steam" "$modifier, T, exec, thunar" - "$modifier, V, exec, codium" "$modifier, W, exec, ${browser}" "$modifier, Z, exec, zeditor" @@ -40,13 +35,16 @@ in "$modifier SHIFT, W, exec, web-search" # ============================================================================= - # APLIKACJE - Z ALT I CONTROL + # APLIKACJE - Z ALT # ============================================================================= - "$modifier ALT, B, exec, btop" "$modifier ALT, G, exec, dex ${desktopEntriesPath}/glance.desktop" "$modifier ALT, M, exec, dex ${desktopEntriesPath}/mastodon.desktop" "$modifier ALT, S, exec, slack" "$modifier ALT, T, exec, gnome-text-editor" + + # ============================================================================= + # APLIKACJE - Z CONTROL + # ============================================================================= "$modifier CONTROL, M, exec, mattermost-desktop" # ============================================================================= @@ -140,9 +138,14 @@ in ",XF86MonBrightnessUp, exec, brightnessctl set +5%" # ============================================================================= - # NIEUŻYWANE KEYBINDY (ZAKOMENTOWANE) + # NIEUŻYWANE KEYBINDY # ============================================================================= - # "$modifier , R, exec, rofi-launcher" + # "$modifier, B, exec, bitwarden" + # "$modifier, G, exec, affinity-v3" + # "$modifier, L, exec, logseq" + # "$modifier, O, exec, obs" + # "$modifier, V, exec, codium" + # "$modifier SHIFT, N, exec, swaync-client -rs" # "$modifier, P, pseudo," # "$modifier SHIFT,F, togglefloating," diff --git a/modules/home/obs-studio.nix b/modules/home/obs-studio.nix index 0d8a7f3..b9d2a6e 100644 --- a/modules/home/obs-studio.nix +++ b/modules/home/obs-studio.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { programs.obs-studio = { - enable = true; + enable = false; plugins = with pkgs.obs-studio-plugins; [ wlrobs obs-pipewire-audio-capture diff --git a/modules/home/zed.nix b/modules/home/zed.nix index 7296f44..0004881 100644 --- a/modules/home/zed.nix +++ b/modules/home/zed.nix @@ -29,6 +29,8 @@ extraPackages = with pkgs; [ biome rust-analyzer + nixd + nil ]; userSettings = {