From 01f47b02935d550005ef57126f0b7143eb144cee Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Mon, 15 Apr 2024 10:50:56 +0200 Subject: [PATCH 01/20] Update config structure in lars --- hosts/lars/default.nix | 9 +++++++++ hosts/lars/dyonisos/default.nix | 2 -- hosts/lars/kronos/default.nix | 2 -- hosts/lars/programs.nix | 1 - 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hosts/lars/default.nix b/hosts/lars/default.nix index e2c5d9c..e1d3cb1 100644 --- a/hosts/lars/default.nix +++ b/hosts/lars/default.nix @@ -1,5 +1,10 @@ { config, inputs, pkgs, ... }: { + imports = [ + ./hyprland.nix + ./programs.nix + ]; + nixpkgs.config.allowUnfree = true; time.timeZone = "Europe/Zurich"; security.sudo.package = pkgs.sudo.override { withInsults = true; }; @@ -62,6 +67,10 @@ enable = true; catppuccin = true; }; + + neovim = { + enable = true; + }; }; services = { diff --git a/hosts/lars/dyonisos/default.nix b/hosts/lars/dyonisos/default.nix index 2d68268..22a270e 100644 --- a/hosts/lars/dyonisos/default.nix +++ b/hosts/lars/dyonisos/default.nix @@ -1,8 +1,6 @@ _: { imports = [ ../. - ./../programs.nix - ./../hyprland.nix ./programs.nix ./configuration.nix ./hardware-configuration.nix diff --git a/hosts/lars/kronos/default.nix b/hosts/lars/kronos/default.nix index 2d68268..22a270e 100644 --- a/hosts/lars/kronos/default.nix +++ b/hosts/lars/kronos/default.nix @@ -1,8 +1,6 @@ _: { imports = [ ../. - ./../programs.nix - ./../hyprland.nix ./programs.nix ./configuration.nix ./hardware-configuration.nix diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix index ed7673c..aa06b8c 100644 --- a/hosts/lars/programs.nix +++ b/hosts/lars/programs.nix @@ -43,7 +43,6 @@ in { smartmontools python3 rustdesk - neovim tmux kitty nextcloud-client From 4ffa2095b1337af405eacbf220179ec098ef7c16 Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Mon, 15 Apr 2024 10:51:11 +0200 Subject: [PATCH 02/20] added some things in neovim config --- modules/tui/neovim.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/tui/neovim.nix b/modules/tui/neovim.nix index e87674d..1b99f54 100644 --- a/modules/tui/neovim.nix +++ b/modules/tui/neovim.nix @@ -82,6 +82,7 @@ in { java-language-server.enable = true; #pylyzer.enable = true; rnix-lsp.enable = true; + pyright.enable = true; }; #onAttach = '' # vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') @@ -159,11 +160,36 @@ in { enable = true; settings.theme = "dark"; }; + }; extraPlugins = with pkgs.vimPlugins; [ zen-mode-nvim + lazygit-nvim ]; + + keymaps = [ + { + mode = "n"; + key = "pv"; + action = "Explore"; + } + { + mode = "n"; + key = "w"; + action = "w"; + } + { + mode = "n"; + key = "q"; + action = "q"; + } + { + mode = "n"; + key = "gg"; + action = "LazyGit"; + } + ]; }; }; }; From e33a1c11da1a5cc18d1cd975f9f6f95b0e9550eb Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Mon, 15 Apr 2024 11:36:17 +0200 Subject: [PATCH 03/20] Added some programs --- hosts/lars/default.nix | 3 +++ hosts/lars/programs.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/hosts/lars/default.nix b/hosts/lars/default.nix index e1d3cb1..6915250 100644 --- a/hosts/lars/default.nix +++ b/hosts/lars/default.nix @@ -108,6 +108,9 @@ console.keyMap = "sg"; # services.flatpak.enable = true; + services = { + twingate.enable = true; + }; system.stateVersion = "23.11"; nix.settings.experimental-features = ["nix-command" "flakes"]; diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix index aa06b8c..ed152b6 100644 --- a/hosts/lars/programs.nix +++ b/hosts/lars/programs.nix @@ -56,6 +56,7 @@ in { xdg-utils # xdg-mime script webcord element-desktop + toipe ]; }; } From 67d9bbee4e20d2f46439e5dd94b9cdfc2a424eaa Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Mon, 15 Apr 2024 12:23:39 +0200 Subject: [PATCH 04/20] Fixed quit keymap in nvim --- modules/tui/neovim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/tui/neovim.nix b/modules/tui/neovim.nix index 1b99f54..a05a53d 100644 --- a/modules/tui/neovim.nix +++ b/modules/tui/neovim.nix @@ -181,7 +181,7 @@ in { } { mode = "n"; - key = "q"; + key = "qw"; action = "q"; } { From 324068732161ce274f126898585e1790b8c48897 Mon Sep 17 00:00:00 2001 From: get Date: Mon, 15 Apr 2024 13:18:01 +0200 Subject: [PATCH 05/20] Added hyprland wallpaper --- hosts/lars/dyonisos/configuration.nix | 1 + hosts/lars/hyprland.nix | 7 +++++++ hosts/lars/programs.nix | 1 + 3 files changed, 9 insertions(+) diff --git a/hosts/lars/dyonisos/configuration.nix b/hosts/lars/dyonisos/configuration.nix index e41888a..3142fa9 100644 --- a/hosts/lars/dyonisos/configuration.nix +++ b/hosts/lars/dyonisos/configuration.nix @@ -10,6 +10,7 @@ hyprland = { enable = true; monitor = [",preferred,auto,2"]; + wallpaper = "wallpaper/nix.png"; }; }; } diff --git a/hosts/lars/hyprland.nix b/hosts/lars/hyprland.nix index 41168ce..1299063 100644 --- a/hosts/lars/hyprland.nix +++ b/hosts/lars/hyprland.nix @@ -2,6 +2,7 @@ with lib; let username = config.modules.other.system.username; cfg = config.modules.hyprland; + gitPath = config.modules.other.system.gitPath; in { imports = [ ./waybar.nix @@ -20,6 +21,11 @@ in { default = {}; type = types.attrs; }; + wallpaper = mkOption { + description = "wallpaper relative from assets"; + default = ""; + type = types.str; + }; }; config = mkIf cfg.enable { @@ -84,6 +90,7 @@ in { exec-once = [ "waybar" + "swww init & swww img ${gitPath}/${cfg.wallpaper}" ]; bind = [ diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix index ed7673c..a730582 100644 --- a/hosts/lars/programs.nix +++ b/hosts/lars/programs.nix @@ -57,6 +57,7 @@ in { xdg-utils # xdg-mime script webcord element-desktop + swww ]; }; } From ff55b2c3a2721e7545cb237a9e2022718583642d Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Tue, 16 Apr 2024 08:59:20 +0200 Subject: [PATCH 06/20] Wallpapers added --- hosts/lars/dyonisos/configuration.nix | 2 +- hosts/lars/kronos/configuration.nix | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hosts/lars/dyonisos/configuration.nix b/hosts/lars/dyonisos/configuration.nix index 3142fa9..cf9ab76 100644 --- a/hosts/lars/dyonisos/configuration.nix +++ b/hosts/lars/dyonisos/configuration.nix @@ -10,7 +10,7 @@ hyprland = { enable = true; monitor = [",preferred,auto,2"]; - wallpaper = "wallpaper/nix.png"; + wallpaper = "wallpaper/wave.jpg"; }; }; } diff --git a/hosts/lars/kronos/configuration.nix b/hosts/lars/kronos/configuration.nix index 0d0af04..be46c8a 100644 --- a/hosts/lars/kronos/configuration.nix +++ b/hosts/lars/kronos/configuration.nix @@ -22,11 +22,12 @@ "DP-2,2560x1440@144,0x0,1" "DP-1,1920x1080@60,2560x0,1" ]; - extra = { - exec-once = [ - "hyprctl dispatch moveworkspacetomonitor 1 DP-2" - ]; - }; + extra = { + exec-once = [ + "hyprctl dispatch moveworkspacetomonitor 1 DP-2" + ]; + }; + wallpaper = "wallpaper/wave.jpg"; }; }; From e2c23e3897380f21562ffc1ac2636cec7576a2f7 Mon Sep 17 00:00:00 2001 From: get Date: Tue, 16 Apr 2024 11:33:53 +0200 Subject: [PATCH 07/20] Added keepassxc --- hosts/lars/programs.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix index 35d5eee..f8395b6 100644 --- a/hosts/lars/programs.nix +++ b/hosts/lars/programs.nix @@ -56,8 +56,9 @@ in { xdg-utils # xdg-mime script webcord element-desktop - swww + swww toipe + keepassxc ]; }; } From 28415f157421de0a16446be74dd2af91517a0666 Mon Sep 17 00:00:00 2001 From: larszauberer Date: Tue, 16 Apr 2024 11:40:38 +0200 Subject: [PATCH 08/20] Yazi alias added --- hosts/lars/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/lars/default.nix b/hosts/lars/default.nix index 6915250..345e8cb 100644 --- a/hosts/lars/default.nix +++ b/hosts/lars/default.nix @@ -34,7 +34,8 @@ profiling = false; extraAliases = { cls = "clear"; - Hyprland = "dbus-run-session Hyprland"; + Hyprland = "dbus-run-session Hyprland"; + y = "yazi"; }; ohmyzsh = { enable = true; From 62f42d668fc7ceb6a5fe93b459bdb113f8f2d30c Mon Sep 17 00:00:00 2001 From: larszauberer Date: Tue, 16 Apr 2024 12:28:49 +0200 Subject: [PATCH 09/20] ssh-agent --- hosts/lars/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/lars/default.nix b/hosts/lars/default.nix index 345e8cb..218cf09 100644 --- a/hosts/lars/default.nix +++ b/hosts/lars/default.nix @@ -113,6 +113,9 @@ twingate.enable = true; }; + # SSH AGENT + programs.ssh.startAgent = true; + system.stateVersion = "23.11"; nix.settings.experimental-features = ["nix-command" "flakes"]; } From 432fbed5d2b782003f589439b5693944d75a627d Mon Sep 17 00:00:00 2001 From: larszauberer Date: Tue, 16 Apr 2024 15:26:58 +0200 Subject: [PATCH 10/20] disable gnome keyring --- hosts/lars/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/lars/default.nix b/hosts/lars/default.nix index 218cf09..448437f 100644 --- a/hosts/lars/default.nix +++ b/hosts/lars/default.nix @@ -115,6 +115,7 @@ # SSH AGENT programs.ssh.startAgent = true; + services.gnome3.gnome-keyring.enable = false; system.stateVersion = "23.11"; nix.settings.experimental-features = ["nix-command" "flakes"]; From 82d76e178ebeb4f9a77b62691d2e05fdb2b6b422 Mon Sep 17 00:00:00 2001 From: larszauberer Date: Tue, 16 Apr 2024 15:27:03 +0200 Subject: [PATCH 11/20] add bluetooth client --- hosts/lars/programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix index f8395b6..e4b0fee 100644 --- a/hosts/lars/programs.nix +++ b/hosts/lars/programs.nix @@ -59,6 +59,7 @@ in { swww toipe keepassxc + bluetuith ]; }; } From 414dbadac830ca1b4e2b22a53f3c4cf8433d2400 Mon Sep 17 00:00:00 2001 From: larszauberer Date: Tue, 16 Apr 2024 16:04:17 +0200 Subject: [PATCH 12/20] Bluetooth --- hosts/lars/dyonisos/profile.nix | 1 + hosts/lars/kronos/profile.nix | 1 + hosts/lars/programs.nix | 1 - options/common/bluetooth.nix | 19 +++++++++++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 options/common/bluetooth.nix diff --git a/hosts/lars/dyonisos/profile.nix b/hosts/lars/dyonisos/profile.nix index d4fe1e8..33aae1b 100644 --- a/hosts/lars/dyonisos/profile.nix +++ b/hosts/lars/dyonisos/profile.nix @@ -5,5 +5,6 @@ _: { ../../../options/common/networking.nix ../../../options/common/pin-registry.nix ../../../options/common/preserve-system.nix + ../../../options/common/bluetooth.nix ]; } diff --git a/hosts/lars/kronos/profile.nix b/hosts/lars/kronos/profile.nix index 30407f5..e567018 100644 --- a/hosts/lars/kronos/profile.nix +++ b/hosts/lars/kronos/profile.nix @@ -6,5 +6,6 @@ _: { ../../../options/common/gpu/nvidia.nix ../../../options/common/pin-registry.nix ../../../options/common/preserve-system.nix + ../../../options/common/bluetooth.nix ]; } diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix index e4b0fee..f8395b6 100644 --- a/hosts/lars/programs.nix +++ b/hosts/lars/programs.nix @@ -59,7 +59,6 @@ in { swww toipe keepassxc - bluetuith ]; }; } diff --git a/options/common/bluetooth.nix b/options/common/bluetooth.nix new file mode 100644 index 0000000..3d24814 --- /dev/null +++ b/options/common/bluetooth.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: +let + username = config.modules.other.system.username; +in { + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + }; + + services.blueman.enable = true; + + # Bluetooth headset media control buttons + systemd.user.services.mpris-proxy = { + description = "Mpris proxy"; + after = [ "network.target" "sound.target" ]; + wantedBy = [ "default.target" ]; + serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy"; + }; +} From d962a99500c20dfd4602a6cdeb31a15d17d1aa46 Mon Sep 17 00:00:00 2001 From: larszauberer Date: Tue, 16 Apr 2024 20:25:10 +0200 Subject: [PATCH 13/20] Vivaldi added --- hosts/lars/hyprland.nix | 1 + hosts/lars/programs.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/hosts/lars/hyprland.nix b/hosts/lars/hyprland.nix index 1299063..d17ead0 100644 --- a/hosts/lars/hyprland.nix +++ b/hosts/lars/hyprland.nix @@ -107,6 +107,7 @@ in { "$mod, o, exec, obsidian --ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WaylandWindowDecorations --enable-features=WebRTCPipeWireCpaturer --disable-gpu" "$mod SHIFT, D, exec, webcord --ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WaylandWindowDecorations --enable-features=WebRTCPipeWireCpaturer --disable-gpu" "$mod SHIFT, L, exec, element-desktop --ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WaylandWindowDecorations --enable-features=WebRTCPipeWireCpaturer --disable-gpu" + "$mod, v, exec, vivaldi --ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WaylandWindowDecorations --enable-features=WebRTCPipeWireCpaturer --disable-gpu" # Monitor management "$mod SHIFT, k, movecurrentworkspacetomonitor, DP-2" diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix index f8395b6..6198624 100644 --- a/hosts/lars/programs.nix +++ b/hosts/lars/programs.nix @@ -59,6 +59,7 @@ in { swww toipe keepassxc + vivaldi ]; }; } From 2f2166d66d0773f96ea9f54f191688017e5d3d15 Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Wed, 17 Apr 2024 10:45:18 +0200 Subject: [PATCH 14/20] Try to fix screenshots --- hosts/lars/hyprland.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hosts/lars/hyprland.nix b/hosts/lars/hyprland.nix index 1299063..5d80b16 100644 --- a/hosts/lars/hyprland.nix +++ b/hosts/lars/hyprland.nix @@ -120,7 +120,8 @@ in { "$mod, F, fullscreen" # Screenshot - "$mod SHIFT, s, exec, grim -g '$(slurp -d)' - | wl-copy" + "$mod SHIFT, s, exec, grim -g \"$(slurp -d)\" - | wl-copy" + ] ++ ( builtins.concatLists (builtins.genList ( @@ -136,6 +137,11 @@ in { ) 10) ); + # Mouse movement + bindm = [ + "$mod, mouse:272, movewindow" + "$mod, mouse:273, resizewindow" + ]; } cfg.extra]; }; }; From be2f90589e8f0664210b24ad66ed092dd5b6ba63 Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Wed, 17 Apr 2024 15:56:38 +0200 Subject: [PATCH 15/20] Added firefox extensions --- hosts/lars/default.nix | 8 +++++++ modules/gui/firefox.nix | 46 +++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/hosts/lars/default.nix b/hosts/lars/default.nix index 448437f..39987bb 100644 --- a/hosts/lars/default.nix +++ b/hosts/lars/default.nix @@ -61,6 +61,14 @@ install_url = "https://addons.mozilla.org/firefox/downloads/file/4231522/new_tab_override-16.0.0.xpi"; installation_mode = "force_installed"; }; + "keepassxc-browser@keepassxc.org" = { + install_url = "https://addons.mozilla.org/firefox/downloads/file/4257616/keepassxc_browser-1.9.0.3.xpi"; + installation_mode = "force_installed"; + }; + "{7be2ba16-0f1e-4d93-9ebc-5164397477a9}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/file/3756025/videospeed-0.6.3.3.xpi"; + installation_mode = "force_installed"; + }; }; }; diff --git a/modules/gui/firefox.nix b/modules/gui/firefox.nix index 07704ca..b948b0b 100644 --- a/modules/gui/firefox.nix +++ b/modules/gui/firefox.nix @@ -18,7 +18,7 @@ in { enable = true; policies = { - DisableTelemetry = true; + DisableTelemetry = true; DisableFirefoxStudies = true; EnableTrackingProtection = { Value= true; @@ -36,28 +36,30 @@ in { DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab" DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" SearchBar = "unified"; # alternative: "separate" - FirefoxSuggest = { - WebSuggestions = true; - ImproveSuggest = true; - Locked = true; - }; - SearchSuggestEnabled = true; - theme = { - colors = { - background-darker = "181825"; - background = "1e1e2e"; - foreground = "cdd6f4"; - }; - }; + FirefoxSuggest = { + WebSuggestions = true; + ImproveSuggest = true; + Locked = true; + }; + SearchSuggestEnabled = true; + theme = { + colors = { + background-darker = "181825"; + background = "1e1e2e"; + foreground = "cdd6f4"; + }; + }; - font = "Lexend"; - ExtensionSettings = lib.mkMerge [{ - "uBlock0@raymondhill.net" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; - installation_mode = "force_installed"; - }; - } cfg.extensions]; - }; + OfferToSaveLogins = false; + + font = "Lexend"; + ExtensionSettings = lib.mkMerge [{ + "uBlock0@raymondhill.net" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; + installation_mode = "force_installed"; + }; + } cfg.extensions]; + }; }; }; }; From 7934ff1d6aaa29cbad3a2dcdadfd8f3f14f02fdf Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Wed, 17 Apr 2024 15:56:45 +0200 Subject: [PATCH 16/20] Added steam --- hosts/lars/hyprland.nix | 4 ++++ hosts/lars/kronos/configuration.nix | 5 +++++ modules/gui/default.nix | 1 + modules/gui/steam.nix | 22 ++++++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 modules/gui/steam.nix diff --git a/hosts/lars/hyprland.nix b/hosts/lars/hyprland.nix index 63cfa79..5353ff2 100644 --- a/hosts/lars/hyprland.nix +++ b/hosts/lars/hyprland.nix @@ -120,6 +120,10 @@ in { "$mod, down, movefocus, d" "$mod, F, fullscreen" + # Special Workspaces + "$mod SHIFT, F, movetoworkspacesilent, special" + "$mod, s, togglespecialworkspace," + # Screenshot "$mod SHIFT, s, exec, grim -g \"$(slurp -d)\" - | wl-copy" diff --git a/hosts/lars/kronos/configuration.nix b/hosts/lars/kronos/configuration.nix index be46c8a..01cc83c 100644 --- a/hosts/lars/kronos/configuration.nix +++ b/hosts/lars/kronos/configuration.nix @@ -13,6 +13,11 @@ opacity = 0.8; blur = true; }; + + steam = { + enable = true; + gamescope = true; + }; }; hyprland = { diff --git a/modules/gui/default.nix b/modules/gui/default.nix index 95868e4..d950bdf 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -13,5 +13,6 @@ _: { ./WM ./alacritty.nix ./firefox.nix + ./steam.nix ]; } diff --git a/modules/gui/steam.nix b/modules/gui/steam.nix new file mode 100644 index 0000000..ca600f2 --- /dev/null +++ b/modules/gui/steam.nix @@ -0,0 +1,22 @@ + +{ config, lib, inputs, pkgs, ... }: +with lib; let + username = config.modules.other.system.username; + cfg = config.modules.programs.steam; +in { + options.modules.programs.steam = { + enable = mkEnableOption "steam"; + gamescope = mkEnableOption "gamescope"; + }; + + config = mkIf cfg.enable { + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + gamescopeSession.enable = mkIf cfg.gamescope true; + }; + home-manager.users.${username} = { + }; + }; +} From 4efb439aee7999a4f36ad7e4dead091a6f28e74d Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Wed, 17 Apr 2024 23:09:58 +0200 Subject: [PATCH 17/20] Autostart and some extra programs --- hosts/lars/hyprland.nix | 3 +++ hosts/lars/programs.nix | 2 ++ 2 files changed, 5 insertions(+) diff --git a/hosts/lars/hyprland.nix b/hosts/lars/hyprland.nix index 5353ff2..cd12319 100644 --- a/hosts/lars/hyprland.nix +++ b/hosts/lars/hyprland.nix @@ -91,6 +91,9 @@ in { exec-once = [ "waybar" "swww init & swww img ${gitPath}/${cfg.wallpaper}" + "keepassxc" + "nextcloud" + "element-desktop --ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WaylandWindowDecorations --enable-features=WebRTCPipeWireCpaturer --disable-gpu" ]; bind = [ diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix index 6198624..5e0dd5a 100644 --- a/hosts/lars/programs.nix +++ b/hosts/lars/programs.nix @@ -60,6 +60,8 @@ in { toipe keepassxc vivaldi + fzf + nix-index ]; }; } From 071543e747d422e56f54c9f935d4697d70332686 Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Wed, 17 Apr 2024 23:10:24 +0200 Subject: [PATCH 18/20] Minecraft wayland patch try --- hosts/lars/kronos/programs.nix | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/hosts/lars/kronos/programs.nix b/hosts/lars/kronos/programs.nix index 631e805..8877ef2 100644 --- a/hosts/lars/kronos/programs.nix +++ b/hosts/lars/kronos/programs.nix @@ -1,6 +1,30 @@ -{ config, inputs, pkgs, ... }: +{ config, inputs, pkgs, lib, ... }: let username = config.modules.other.system.username; + + # Fetch the GLFW with Wayland patches for Minecraft + customGLFW = let + mcWaylandPatchRepo = pkgs.fetchFromGitHub { + owner = "Admicos"; + repo = "minecraft-wayland"; + rev = "370ce5b95e3ae9bc4618fb45113bc641fbb13867"; + sha256 = "sha256-RPRg6Gd7N8yyb305V607NTC1kUzvyKiWsh6QlfHW+JE="; + }; + mcWaylandPatches = map (name: "${mcWaylandPatchRepo}/${name}") + (lib.naturalSort (builtins.attrNames (lib.filterAttrs + (name: type: + type == "regular" && lib.hasSuffix ".patch" name) + (builtins.readDir mcWaylandPatchRepo)))); + in pkgs.glfw.overrideAttrs (previousAttrs: { + patches = previousAttrs.patches ++ mcWaylandPatches; + buildInputs = previousAttrs.buildInputs ++ [ pkgs.wayland ]; + }); + + # Minecraft launcher with the custom GLFW + minecraftPrismLauncher = pkgs.prismlauncher.override { + glfw = customGLFW; + }; + in { home-manager.users.${username} = { home.packages = let @@ -9,4 +33,9 @@ in { in with pkgs; [ ]; }; + + # System-wide installation of Minecraft PrismLauncher + environment.systemPackages = [ + minecraftPrismLauncher + ]; } From ef2be777a6c4677ab052f4a8c21b8960f8564e0c Mon Sep 17 00:00:00 2001 From: larszauberer Date: Thu, 18 Apr 2024 11:34:28 +0200 Subject: [PATCH 19/20] yubico key software --- hosts/lars/programs.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/lars/programs.nix b/hosts/lars/programs.nix index 6198624..3f84294 100644 --- a/hosts/lars/programs.nix +++ b/hosts/lars/programs.nix @@ -60,6 +60,9 @@ in { toipe keepassxc vivaldi + yubikey-personalization-gui + yubikey-personalization + yubioath-flutter ]; }; } From ec2250c5191bb9f29fa7b524f03634fde39197d6 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 18 Apr 2024 19:11:31 +0200 Subject: [PATCH 20/20] added programs --- hosts/vali/mars/programs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/vali/mars/programs.nix b/hosts/vali/mars/programs.nix index 5c068f8..ce02283 100644 --- a/hosts/vali/mars/programs.nix +++ b/hosts/vali/mars/programs.nix @@ -26,6 +26,7 @@ in { ffmpeg_6-full flameshot foot + img2pdf gcc gdb gnumake @@ -47,6 +48,7 @@ in { pamixer pavucontrol pcmanfm + pdfarranger pfetch playerctl polkit