diff --git a/common/vscode.nix b/common/vscode.nix index 46c1634..b52d6ac 100755 --- a/common/vscode.nix +++ b/common/vscode.nix @@ -3,122 +3,119 @@ programs.vscode = { enable = true; package = pkgs.vscodium; - extensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "vsc-prolog"; - publisher = "arthurwang"; - version = "0.8.23"; - sha256 = "1i6rgz8ap269pph6bh04bimw9yyajd7iyq8dvv7sqmpfk859vb8d"; - } - { - name = "agda-mode"; - publisher = "banacorn"; - version = "0.5.1"; - sha256 = "02r28a8y6pdjhad76z193xrlc4yk4fsynn064w7cff56gdc31bd5"; - } - { - name = "nix"; - publisher = "bbenoist"; - version = "1.0.1"; - sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b"; - } - { - name = "catppuccin-vsc"; - publisher = "catppuccin"; - version = "3.16.0"; - sha256 = "1g4021qrsy67fw2b1lvazn58nvr64dkvpywqanbpz24dlgk2573r"; - } - { - name = "doxdocgen"; - publisher = "cschlosser"; - version = "1.4.0"; - sha256 = "1d95znf2vsdzv9jqiigh9zm62dp4m9jz3qcfaxn0n0pvalbiyw92"; - } - { - name = "simple-alignment"; - publisher = "earshinov"; - version = "1.0.1"; - sha256 = "1ak1v1dbwx7d6ablla5njznj59z9jaqbzmci22jmpsd3a70kka1f"; - } - { - name = "yuck"; - publisher = "eww-yuck"; - version = "0.0.3"; - sha256 = "1hxdxa13s1vlilw7fidr8vnl19c9wjazjvnvmqgl4fsswwny110c"; - } - { - name = "todo-tree"; - publisher = "gruntfuggly"; - version = "0.0.226"; - sha256 = "0yrc9qbdk7zznd823bqs1g6n2i5xrda0f9a7349kknj9wp1mqgqn"; - } - { - name = "haskell"; - publisher = "haskell"; - version = "2.5.3"; - sha256 = "13s39fvb6kwxklcfsa5xh4z7y8y3y0h6jv39ljrgl24qkwgx8xnw"; - } - { - name = "latex-workshop"; - publisher = "james-yu"; - version = "10.7.5"; - sha256 = "0habsbk0w2g8vcxqzdbnwy6f0x0ghvcx1f9szd4p1pwjfij2vnax"; - } - { - name = "c-cpp-flylint"; - publisher = "jbenden"; - version = "1.15.0"; - sha256 = "1z1l9ygxsqjn8vpncjzyisdg2sirgzf4ghiv5ak32mkq3k8hgawk"; - } - { - name = "better-cpp-syntax"; - publisher = "jeff-hykin"; - version = "1.27.1"; - sha256 = "037nigza7n71j5vgl3qw0swrmy8gvfj9m8jbi1nb2a3lmsifivqq"; - } - { - name = "language-haskell"; - publisher = "justusadam"; - version = "3.6.0"; - sha256 = "115y86w6n2bi33g1xh6ipz92jz5797d3d00mr4k8dv5fz76d35dd"; - } - { - name = "lean4"; - publisher = "leanprover"; - version = "0.0.187"; - sha256 = "04pyq6v0s5dy6b8bpjakp33dff4plxxa100x8gvbw36v6ddpsx7d"; - } - { - name = "vscoq"; - publisher = "maximedenes"; - version = "2.2.1"; - sha256 = "04m1dby6zfzg5nahnricjax28g47mgnja7d9cbll270i7ahnyncm"; - } - { - name = "direnv"; - publisher = "mkhl"; - version = "0.17.0"; - sha256 = "1n2qdd1rspy6ar03yw7g7zy3yjg9j1xb5xa4v2q12b0y6dymrhgn"; - } - { - name = "cpptools"; - publisher = "ms-vscode"; - version = "1.23.3"; - sha256 = "sha256-YOtPISpr23g/4T7u+ZHZz9mJOBI4GpifhqfP1bNhOkU="; - } - { - name = "vscode-ltex"; - publisher = "valentjn"; - version = "13.1.0"; - sha256 = "15qm97i9l65v3x0zxl1895ilazz2jk2wmizbj7kmds613jz7d46c"; - } - { - name = "markdown-all-in-one"; - publisher = "yzhang"; - version = "3.6.2"; - sha256 = "1n9d3qh7vypcsfygfr5rif9krhykbmbcgf41mcjwgjrf899f11h4"; - } - ]; + extensions = with pkgs.vscode-extensions; [ + ms-vscode.cpptools + ] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "vsc-prolog"; + publisher = "arthurwang"; + version = "0.8.23"; + sha256 = "1i6rgz8ap269pph6bh04bimw9yyajd7iyq8dvv7sqmpfk859vb8d"; + } + { + name = "agda-mode"; + publisher = "banacorn"; + version = "0.5.1"; + sha256 = "02r28a8y6pdjhad76z193xrlc4yk4fsynn064w7cff56gdc31bd5"; + } + { + name = "nix"; + publisher = "bbenoist"; + version = "1.0.1"; + sha256 = "0zd0n9f5z1f0ckzfjr38xw2zzmcxg1gjrava7yahg5cvdcw6l35b"; + } + { + name = "catppuccin-vsc"; + publisher = "catppuccin"; + version = "3.16.0"; + sha256 = "1g4021qrsy67fw2b1lvazn58nvr64dkvpywqanbpz24dlgk2573r"; + } + { + name = "doxdocgen"; + publisher = "cschlosser"; + version = "1.4.0"; + sha256 = "1d95znf2vsdzv9jqiigh9zm62dp4m9jz3qcfaxn0n0pvalbiyw92"; + } + { + name = "simple-alignment"; + publisher = "earshinov"; + version = "1.0.1"; + sha256 = "1ak1v1dbwx7d6ablla5njznj59z9jaqbzmci22jmpsd3a70kka1f"; + } + { + name = "yuck"; + publisher = "eww-yuck"; + version = "0.0.3"; + sha256 = "1hxdxa13s1vlilw7fidr8vnl19c9wjazjvnvmqgl4fsswwny110c"; + } + { + name = "todo-tree"; + publisher = "gruntfuggly"; + version = "0.0.226"; + sha256 = "0yrc9qbdk7zznd823bqs1g6n2i5xrda0f9a7349kknj9wp1mqgqn"; + } + { + name = "haskell"; + publisher = "haskell"; + version = "2.5.3"; + sha256 = "13s39fvb6kwxklcfsa5xh4z7y8y3y0h6jv39ljrgl24qkwgx8xnw"; + } + { + name = "latex-workshop"; + publisher = "james-yu"; + version = "10.7.5"; + sha256 = "0habsbk0w2g8vcxqzdbnwy6f0x0ghvcx1f9szd4p1pwjfij2vnax"; + } + { + name = "c-cpp-flylint"; + publisher = "jbenden"; + version = "1.15.0"; + sha256 = "1z1l9ygxsqjn8vpncjzyisdg2sirgzf4ghiv5ak32mkq3k8hgawk"; + } + { + name = "better-cpp-syntax"; + publisher = "jeff-hykin"; + version = "1.27.1"; + sha256 = "037nigza7n71j5vgl3qw0swrmy8gvfj9m8jbi1nb2a3lmsifivqq"; + } + { + name = "language-haskell"; + publisher = "justusadam"; + version = "3.6.0"; + sha256 = "115y86w6n2bi33g1xh6ipz92jz5797d3d00mr4k8dv5fz76d35dd"; + } + { + name = "lean4"; + publisher = "leanprover"; + version = "0.0.194"; + sha256 = "1anal0i85vy0y1rfjx6nj82q8bilh2pyh40j6ax9wfsjyrqzrynf"; + } + { + name = "vscoq"; + publisher = "maximedenes"; + version = "2.2.3"; + sha256 = "066l48b22qnxlwnq2328wmldn2dwrjn5d399rp605ahdihl9f7w7"; + } + { + name = "direnv"; + publisher = "mkhl"; + version = "0.17.0"; + sha256 = "1n2qdd1rspy6ar03yw7g7zy3yjg9j1xb5xa4v2q12b0y6dymrhgn"; + } + { + name = "vscode-ltex"; + publisher = "valentjn"; + version = "13.1.0"; + sha256 = "15qm97i9l65v3x0zxl1895ilazz2jk2wmizbj7kmds613jz7d46c"; + } + { + name = "markdown-all-in-one"; + publisher = "yzhang"; + version = "3.6.2"; + sha256 = "1n9d3qh7vypcsfygfr5rif9krhykbmbcgf41mcjwgjrf899f11h4"; + } + ]; userSettings = { "prolog.executablePath" = "/etc/profiles/per-user/leonv/bin/swipl"; "agdaMode.connection.agdaLanguageServer" = false; diff --git a/gunther/configuration.nix b/gunther/configuration.nix index 887bf7d..08b920b 100755 --- a/gunther/configuration.nix +++ b/gunther/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, emacs-overlay, ... }: +{ config, pkgs, lib, ... }: { imports = [ # Include the results of the hardware scan. @@ -31,13 +31,38 @@ nix.optimise.automatic = true; # Bootloader. - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot"; - boot.loader.systemd-boot.enable = true; - boot.loader.systemd-boot.extraEntries."debian.conf" = '' - title Debian - efi /efi/debian/shimx64.efi - ''; + boot = { + # systemd-boot + loader.efi.canTouchEfiVariables = true; + loader.efi.efiSysMountPoint = "/boot"; + loader.systemd-boot.enable = true; + + # plymouth + plymouth = { + enable = true; + theme = "owl"; + themePackages = with pkgs; [ + (adi1090x-plymouth-themes.override { + selected_themes = [ "owl" ]; + }) + ]; + }; + + # Enable "Silent Boot" + consoleLogLevel = 0; + initrd.verbose = false; + kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "loglevel=3" + "rd.systemd.show_status=false" + "rd.udev.log_level=3" + "udev.log_priority=3" + "video=DP-1:2560x1440@144" + "video=HDMI-A-1:1920x1080@75" + ]; + }; networking.hostName = "gunther"; networking.networkmanager.enable = true; @@ -149,6 +174,7 @@ socat texliveFull + adi1090x-plymouth-themes ]; system.stateVersion = "24.05"; diff --git a/gunther/hardware-configuration.nix b/gunther/hardware-configuration.nix index b9f5382..f4feebb 100644 --- a/gunther/hardware-configuration.nix +++ b/gunther/hardware-configuration.nix @@ -9,10 +9,8 @@ ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - boot.kernelParams = [ "video=DP-1:2560x1440@144" "video=HDMI-A-1:1920x1080@75" ]; boot.kernelPackages = pkgs.linuxPackages_latest; fileSystems."/" = diff --git a/gunther/hypr/hyprland.nix b/gunther/hypr/hyprland.nix index f43d707..b933057 100755 --- a/gunther/hypr/hyprland.nix +++ b/gunther/hypr/hyprland.nix @@ -7,13 +7,13 @@ xwayland.enable = true; settings = { workspace = [ - "1, monitor:HDMI-A-5, default:true, persistent:true" - "2, monitor:DP-3 , default:true, persistent:true" - "special:scratchpad, on-created-empty:foot" + "1, monitor:HDMI-A-1, default:true, persistent:true" + "2, monitor:DP-1 , default:true, persistent:true" + "special:scratchpad , on-created-empty:foot" ]; monitor = [ - "DP-3 , 2560x1440@144, 1920x0, 1" - "HDMI-A-5, 1920x1080@75 , 0x0 , 1" + "DP-1 , 2560x1440@144, 1920x0, 1" + "HDMI-A-1, 1920x1080@75 , 0x0 , 1" ]; input = { kb_layout = "de"; diff --git a/gunther/hypr/wallpaper.jpg b/gunther/hypr/wallpaper.jpg old mode 100755 new mode 100644 index c36b7fd..0648771 Binary files a/gunther/hypr/wallpaper.jpg and b/gunther/hypr/wallpaper.jpg differ