diff --git a/dotfiles/.bash_aliases b/dotfiles/.bash_aliases index 800406e..5036b01 100644 --- a/dotfiles/.bash_aliases +++ b/dotfiles/.bash_aliases @@ -1,6 +1,6 @@ alias ll='ls -la' alias nrs='sudo nixos-rebuild --use-remote-sudo switch' alias nrb='sudo nixos-rebuild --use-remote-sudo boot' -alias nfmt="find . -type f -name '*.nix' -exec nixfmt {} \;" +alias ngc='sudo nix-collect-garbage --delete-older-than 14d' alias code='codium' alias rgf='rg --files | rg' \ No newline at end of file diff --git a/gentoo/portage/package.accept_keywords/awscli b/gentoo/portage/package.accept_keywords/awscli deleted file mode 100644 index fe66843..0000000 --- a/gentoo/portage/package.accept_keywords/awscli +++ /dev/null @@ -1 +0,0 @@ -app-admin/awscli-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/firefox-dev b/gentoo/portage/package.accept_keywords/firefox-dev deleted file mode 100644 index cfc77c9..0000000 --- a/gentoo/portage/package.accept_keywords/firefox-dev +++ /dev/null @@ -1 +0,0 @@ -www-client/firefox-developer-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/ghostty b/gentoo/portage/package.accept_keywords/ghostty deleted file mode 100644 index ec5a2e4..0000000 --- a/gentoo/portage/package.accept_keywords/ghostty +++ /dev/null @@ -1,3 +0,0 @@ -dev-lang/zig ~amd64 -x11-terms/ghostty ~amd64 -app-eselect/eselect-zig ~amd64 diff --git a/gentoo/portage/package.accept_keywords/git-filter-repo b/gentoo/portage/package.accept_keywords/git-filter-repo deleted file mode 100644 index 012f216..0000000 --- a/gentoo/portage/package.accept_keywords/git-filter-repo +++ /dev/null @@ -1,2 +0,0 @@ -dev-vcs/git-filter-repo ~amd64 - diff --git a/gentoo/portage/package.accept_keywords/insomnia b/gentoo/portage/package.accept_keywords/insomnia deleted file mode 100644 index 198f073..0000000 --- a/gentoo/portage/package.accept_keywords/insomnia +++ /dev/null @@ -1 +0,0 @@ -dev-util/insomnia-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/just b/gentoo/portage/package.accept_keywords/just deleted file mode 100644 index 6953a92..0000000 --- a/gentoo/portage/package.accept_keywords/just +++ /dev/null @@ -1 +0,0 @@ -dev-build/just ~amd64 diff --git a/gentoo/portage/package.accept_keywords/k9scli b/gentoo/portage/package.accept_keywords/k9scli deleted file mode 100644 index 714fa11..0000000 --- a/gentoo/portage/package.accept_keywords/k9scli +++ /dev/null @@ -1 +0,0 @@ -sys-cluster/k9scli ~amd64 diff --git a/gentoo/portage/package.accept_keywords/logseq b/gentoo/portage/package.accept_keywords/logseq deleted file mode 100644 index 4c3426a..0000000 --- a/gentoo/portage/package.accept_keywords/logseq +++ /dev/null @@ -1 +0,0 @@ -app-editors/logseq-desktop-bin ~amd64 diff --git a/gentoo/portage/package.accept_keywords/opentofu b/gentoo/portage/package.accept_keywords/opentofu deleted file mode 100644 index 795c0ef..0000000 --- a/gentoo/portage/package.accept_keywords/opentofu +++ /dev/null @@ -1 +0,0 @@ -app-admin/opentofu ~amd64 diff --git a/gentoo/portage/package.accept_keywords/wezterm b/gentoo/portage/package.accept_keywords/wezterm deleted file mode 100644 index f836117..0000000 --- a/gentoo/portage/package.accept_keywords/wezterm +++ /dev/null @@ -1 +0,0 @@ -x11-terms/wezterm ~amd64 diff --git a/gentoo/portage/package.accept_keywords/zen-browser b/gentoo/portage/package.accept_keywords/zen-browser deleted file mode 100644 index 9aa731d..0000000 --- a/gentoo/portage/package.accept_keywords/zen-browser +++ /dev/null @@ -1 +0,0 @@ -www-client/zen-bin ~amd64 diff --git a/gentoo/portage/package.use/ghostty b/gentoo/portage/package.use/ghostty deleted file mode 100644 index 9b54264..0000000 --- a/gentoo/portage/package.use/ghostty +++ /dev/null @@ -1,5 +0,0 @@ -media-libs/harfbuzz abi_x86_32 -media-gfx/graphite2 abi_x86_32 -x11-libs/pixman abi_x86_32 -x11-libs/cairo abi_x86_32 -dev-libs/lzo abi_x86_32 diff --git a/gentoo/portage/package.use/iputils b/gentoo/portage/package.use/iputils deleted file mode 100644 index 16cd47d..0000000 --- a/gentoo/portage/package.use/iputils +++ /dev/null @@ -1,2 +0,0 @@ -net-misc/iputils tracepath - diff --git a/nixos/configuration.nix b/nixos/configuration.nix index ce521e2..ac30b54 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -1,9 +1,4 @@ -{ - config, - pkgs, - inputs, - ... -}: +{ config, pkgs, inputs, ... }: { # Bootloader and EFI settings @@ -41,7 +36,7 @@ # Optimization & Garbage Collection # Optimize Nix-Store During Rebuilds - # NOTE: Optimizes during builds - results in slower builds + # NOTE: Optimizes during builds - results in slower builds nix.settings.auto-optimise-store = true; # Purge Unused Nix-Store Entries @@ -53,11 +48,8 @@ # Enable Nix Flakes and experimental features nixpkgs.config.allowUnfree = true; - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; # System state version system.stateVersion = "24.11"; -} +} \ No newline at end of file diff --git a/nixos/flake.nix b/nixos/flake.nix index 177fc98..581c13b 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -5,35 +5,107 @@ zen-browser.url = "github:0xc000022070/zen-browser-flake"; }; - outputs = - { nixpkgs, ... }@inputs: - { - nixosConfigurations = { - tongfang = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; - modules = [ - ./hardware/tongfang.nix - ./configuration.nix - ./users.nix - ./packages.nix - ./services.nix - ./modules/bootloader.nix - ]; - }; - qemu = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; - modules = [ - ./hardware/qemu.nix - - ./modules/kde.nix - ./modules/configuration.nix - ./modules/display-manager.nix - ./modules/greeter.nix - ./modules/networking.nix - ./modules/nix-settings.nix - ./modules/users.nix - ]; - }; + outputs = { nixpkgs, ... } @ inputs: + { + nixosConfigurations = { + tongfang = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; + modules = [ + ./hardware/tongfang.nix + ./configuration.nix + ./users.nix + ./packages.nix + ./services.nix + ]; }; + + # tongfang = nixpkgs.lib.nixosSystem { + # specialArgs = { inherit inputs; }; + # modules = [ + # ./hardware/tongfang.nix + + # ./modules/kde.nix + # ./modules/battery.nix + # ./modules/bluetooth.nix + # ./modules/bootloader.nix + # ./modules/configuration.nix + # ./modules/creative-tools.nix + # ./modules/devops-tools.nix + # ./modules/display-manager.nix + # ./modules/environment-variables.nix + # ./modules/firewall.nix + # ./modules/fonts.nix + # ./modules/gc.nix + # ./modules/greeter.nix + # ./modules/info-fetchers.nix + # ./modules/internationalisation.nix + # ./modules/keyboard.nix + # ./modules/linux-kernel.nix + # ./modules/lsp.nix + # ./modules/networking.nix + # ./modules/nix-settings.nix + # ./modules/nixpkgs.nix + # ./modules/open-ssh.nix + # ./modules/printing.nix + # ./modules/programming-languages.nix + # ./modules/screen.nix + # ./modules/services.nix + # ./modules/sound.nix + # ./modules/terminal-utils.nix + # ./modules/theme.nix + # ./modules/time.nix + # ./modules/usb.nix + # ./modules/users.nix + # ./modules/utils.nix + # ./modules/virtualisation.nix + # ./modules/vpn.nix + # ./modules/work.nix + # ]; + # }; + + # qemu = nixpkgs.lib.nixosSystem { + # specialArgs = { inherit inputs; }; + # modules = [ + # ./hardware/qemu.nix + + # ./modules/kde.nix + # # ./modules/battery.nix + # # ./modules/bluetooth.nix + # # ./modules/bootloader.nix + # ./modules/configuration.nix + # # ./modules/creative-tools.nix + # # ./modules/devops-tools.nix + # ./modules/display-manager.nix + # # ./modules/environment-variables.nix + # # ./modules/firewall.nix + # # ./modules/fonts.nix + # # ./modules/gc.nix + # ./modules/greeter.nix + # # ./modules/info-fetchers.nix + # # ./modules/internationalisation.nix + # # ./modules/keyboard.nix + # # ./modules/linux-kernel.nix + # # ./modules/lsp.nix + # ./modules/networking.nix + # ./modules/nix-settings.nix + # # ./modules/nixpkgs.nix + # # ./modules/open-ssh.nix + # # ./modules/printing.nix + # # ./modules/programming-languages.nix + # # ./modules/screen.nix + # # ./modules/services.nix + # # ./modules/sound.nix + # # ./modules/terminal-utils.nix + # # ./modules/theme.nix + # # ./modules/time.nix + # # ./modules/usb.nix + # ./modules/users.nix + # # ./modules/utils.nix + # # ./modules/virtualisation.nix + # # ./modules/vpn.nix + # # ./modules/work.nix + # ]; + # }; }; + }; } diff --git a/nixos/hardware/qemu.nix b/nixos/hardware/qemu.nix index c34ee3d..aad58ac 100644 --- a/nixos/hardware/qemu.nix +++ b/nixos/hardware/qemu.nix @@ -1,34 +1,22 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: +{ config, lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ - "ahci" - "xhci_pci" - "virtio_pci" - "sr_mod" - "virtio_blk" - ]; + boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/d6b08f23-97da-4e41-b70c-90fcc35db534"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/d6b08f23-97da-4e41-b70c-90fcc35db534"; + fsType = "ext4"; + }; swapDevices = [ ]; diff --git a/nixos/hardware/tongfang.nix b/nixos/hardware/tongfang.nix index f83ec22..f5a93ca 100644 --- a/nixos/hardware/tongfang.nix +++ b/nixos/hardware/tongfang.nix @@ -1,13 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: +{ config, lib, pkgs, modulesPath, ... }: let yt6801 = import ./yt6801.nix { @@ -16,35 +10,25 @@ let }; in { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "nvme" - "xhci_pci" - "thunderbolt" - "usb_storage" - "sd_mod" - "sdhci_pci" - ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ yt6801 ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/c7cf28c3-5744-45cc-8a81-456d24e44b7a"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/CEF6-7DAA"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/CEF6-7DAA"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; swapDevices = [ ]; @@ -57,4 +41,4 @@ in nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} +} \ No newline at end of file diff --git a/nixos/hardware/yt6801.nix b/nixos/hardware/yt6801.nix index 8c040ac..22fd9ca 100644 --- a/nixos/hardware/yt6801.nix +++ b/nixos/hardware/yt6801.nix @@ -48,4 +48,4 @@ stdenv.mkDerivation { ]; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/nixos/modules/battery.nix b/nixos/modules/battery.nix index c390d25..f38e347 100644 --- a/nixos/modules/battery.nix +++ b/nixos/modules/battery.nix @@ -13,4 +13,4 @@ CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; }; }; -} +} \ No newline at end of file diff --git a/nixos/modules/bluetooth.nix b/nixos/modules/bluetooth.nix index 0d92a82..f88ce92 100644 --- a/nixos/modules/bluetooth.nix +++ b/nixos/modules/bluetooth.nix @@ -9,4 +9,4 @@ environment.systemPackages = with pkgs; [ overskride ]; -} +} \ No newline at end of file diff --git a/nixos/modules/bootloader.nix b/nixos/modules/bootloader.nix index 94f827f..cab20c1 100644 --- a/nixos/modules/bootloader.nix +++ b/nixos/modules/bootloader.nix @@ -1,32 +1,17 @@ -{ pkgs, ... }: +{ pkgs, ... }: { # Bootloader options - boot = { - # Enable Plymouth - plymouth = { - enable = true; - font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf"; - themePackages = with pkgs; [ - (adi1090x-plymouth-themes.override { - selected_themes = [ "motion" ]; - }) - ]; - theme = "motion"; - }; - - # 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" - ]; - loader.timeout = 0; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.loader.timeout = 2; + boot.initrd.enable = true; + boot.initrd.systemd.enable = true; + boot.consoleLogLevel = 3; + boot.plymouth = { + enable = true; + font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf"; + themePackages = [ pkgs.nixos-bgrt-plymouth ]; + theme = "nixos-bgrt"; }; -} +} \ No newline at end of file diff --git a/nixos/modules/compilation.nix b/nixos/modules/compilation.nix index 11ba088..85307e9 100644 --- a/nixos/modules/compilation.nix +++ b/nixos/modules/compilation.nix @@ -10,4 +10,4 @@ lldb musl ]; -} +} \ No newline at end of file diff --git a/nixos/modules/configuration.nix b/nixos/modules/configuration.nix index c7ac8e2..1e88924 100644 --- a/nixos/modules/configuration.nix +++ b/nixos/modules/configuration.nix @@ -6,4 +6,4 @@ { system.stateVersion = "24.11"; -} +} \ No newline at end of file diff --git a/nixos/modules/creative-tools.nix b/nixos/modules/creative-tools.nix index 8a5ef2a..b4871c6 100644 --- a/nixos/modules/creative-tools.nix +++ b/nixos/modules/creative-tools.nix @@ -6,4 +6,4 @@ inkscape gimp ]; -} +} \ No newline at end of file diff --git a/nixos/modules/devops-tools.nix b/nixos/modules/devops-tools.nix index 21122c8..fe9af53 100644 --- a/nixos/modules/devops-tools.nix +++ b/nixos/modules/devops-tools.nix @@ -8,4 +8,4 @@ go-task sops ]; -} +} \ No newline at end of file diff --git a/nixos/modules/display-manager.nix b/nixos/modules/display-manager.nix index 93c90a6..54424fc 100644 --- a/nixos/modules/display-manager.nix +++ b/nixos/modules/display-manager.nix @@ -15,4 +15,4 @@ environment.systemPackages = with pkgs; [ greetd.tuigreet ]; -} +} \ No newline at end of file diff --git a/nixos/modules/environment-variables.nix b/nixos/modules/environment-variables.nix index 0a47745..c2e81d8 100644 --- a/nixos/modules/environment-variables.nix +++ b/nixos/modules/environment-variables.nix @@ -5,4 +5,4 @@ environment.variables.SPOTIFY_PATH = "${pkgs.spotify}/"; environment.variables.JDK_PATH = "${pkgs.jdk11}/"; environment.variables.NODEJS_PATH = "${pkgs.nodePackages_latest.nodejs}/"; -} +} \ No newline at end of file diff --git a/nixos/modules/firewall.nix b/nixos/modules/firewall.nix index 4684fc2..f5a4951 100644 --- a/nixos/modules/firewall.nix +++ b/nixos/modules/firewall.nix @@ -4,7 +4,7 @@ # Open ports in the firewall. networking.firewall.enable = true; networking.firewall.allowedTCPPorts = [ ]; - networking.firewall.allowedUDPPorts = [ + networking.firewall.allowedUDPPorts = [ 5353 # Spotify Connect ]; -} +} \ No newline at end of file diff --git a/nixos/modules/fonts.nix b/nixos/modules/fonts.nix index 5e91d21..a21e678 100644 --- a/nixos/modules/fonts.nix +++ b/nixos/modules/fonts.nix @@ -7,4 +7,4 @@ nerd-font-patcher noto-fonts-color-emoji ]; -} +} \ No newline at end of file diff --git a/nixos/modules/gaming.nix b/nixos/modules/gaming.nix index c7d53d9..817b204 100644 --- a/nixos/modules/gaming.nix +++ b/nixos/modules/gaming.nix @@ -3,4 +3,4 @@ { # Enable Steam programs.steam.enable = true; -} +} \ No newline at end of file diff --git a/nixos/modules/gc.nix b/nixos/modules/gc.nix index 683602b..80ef38a 100644 --- a/nixos/modules/gc.nix +++ b/nixos/modules/gc.nix @@ -13,4 +13,4 @@ dates = "weekly"; options = "--delete-older-than 14d"; }; -} +} \ No newline at end of file diff --git a/nixos/modules/gnome.nix b/nixos/modules/gnome.nix index b5b9b17..1f53d7b 100644 --- a/nixos/modules/gnome.nix +++ b/nixos/modules/gnome.nix @@ -7,4 +7,4 @@ desktopManager.gnome.enable = true; displayManager.gdm.enable = true; }; -} +} \ No newline at end of file diff --git a/nixos/modules/greeter.nix b/nixos/modules/greeter.nix index 93c90a6..54424fc 100644 --- a/nixos/modules/greeter.nix +++ b/nixos/modules/greeter.nix @@ -15,4 +15,4 @@ environment.systemPackages = with pkgs; [ greetd.tuigreet ]; -} +} \ No newline at end of file diff --git a/nixos/modules/hyprland.nix b/nixos/modules/hyprland.nix index 8a32db7..bda35ce 100644 --- a/nixos/modules/hyprland.nix +++ b/nixos/modules/hyprland.nix @@ -22,4 +22,4 @@ mpv # media player imv # image viewer ]; -} +} \ No newline at end of file diff --git a/nixos/modules/info-fetchers.nix b/nixos/modules/info-fetchers.nix index 9dca424..7f4e4a1 100644 --- a/nixos/modules/info-fetchers.nix +++ b/nixos/modules/info-fetchers.nix @@ -25,4 +25,4 @@ dig speedtest-rs ]; -} +} \ No newline at end of file diff --git a/nixos/modules/internationalisation.nix b/nixos/modules/internationalisation.nix index 6170a98..46d0b97 100644 --- a/nixos/modules/internationalisation.nix +++ b/nixos/modules/internationalisation.nix @@ -5,7 +5,7 @@ "en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" ]; - + i18n.defaultLocale = "en_US.UTF-8"; i18n.extraLocaleSettings = { @@ -27,4 +27,4 @@ hunspellDicts.en_US hunspellDicts.nl_NL ]; -} +} \ No newline at end of file diff --git a/nixos/modules/kde.nix b/nixos/modules/kde.nix index 29f0685..94c883f 100644 --- a/nixos/modules/kde.nix +++ b/nixos/modules/kde.nix @@ -8,4 +8,4 @@ wayland.enable = true; }; services.desktopManager.plasma6.enable = true; -} +} \ No newline at end of file diff --git a/nixos/modules/keyboard.nix b/nixos/modules/keyboard.nix index 14639e4..0018809 100644 --- a/nixos/modules/keyboard.nix +++ b/nixos/modules/keyboard.nix @@ -11,4 +11,4 @@ gtypist # typing tutor via # keyboard configurator ]; -} +} \ No newline at end of file diff --git a/nixos/modules/linux-kernel.nix b/nixos/modules/linux-kernel.nix index 85a2ca0..d795647 100644 --- a/nixos/modules/linux-kernel.nix +++ b/nixos/modules/linux-kernel.nix @@ -3,7 +3,7 @@ { # Linux Kernel boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen; - boot.kernelParams = [ + boot.kernelParams = [ "splash" "quiet" "fbcon=nodefer" @@ -18,4 +18,4 @@ environment.systemPackages = with pkgs; [ policycoreutils ]; -} +} \ No newline at end of file diff --git a/nixos/modules/lsp.nix b/nixos/modules/lsp.nix index 82742b6..31be33f 100644 --- a/nixos/modules/lsp.nix +++ b/nixos/modules/lsp.nix @@ -27,5 +27,5 @@ terraform-ls ansible-language-server hyprls - ]; -} + ]; +} \ No newline at end of file diff --git a/nixos/modules/networking.nix b/nixos/modules/networking.nix index c63f4dd..8a8902f 100644 --- a/nixos/modules/networking.nix +++ b/nixos/modules/networking.nix @@ -5,9 +5,9 @@ networking.hostName = "tongfang"; networking.networkmanager.enable = true; users.extraGroups.networkmanager.members = [ "bart" ]; - + environment.systemPackages = with pkgs; [ iwgtk impala ]; -} +} \ No newline at end of file diff --git a/nixos/modules/nix-settings.nix b/nixos/modules/nix-settings.nix index 09e5ca3..7431c49 100644 --- a/nixos/modules/nix-settings.nix +++ b/nixos/modules/nix-settings.nix @@ -3,9 +3,6 @@ { # Nix Configuration nix.settings = { - experimental-features = [ - "nix-command" - "flakes" - ]; + experimental-features = [ "nix-command" "flakes" ]; }; -} +} \ No newline at end of file diff --git a/nixos/modules/nixpkgs.nix b/nixos/modules/nixpkgs.nix index 46f31d6..c8adab7 100644 --- a/nixos/modules/nixpkgs.nix +++ b/nixos/modules/nixpkgs.nix @@ -3,4 +3,4 @@ { # Allow unfree packages nixpkgs.config.allowUnfree = true; -} +} \ No newline at end of file diff --git a/nixos/modules/open-ssh.nix b/nixos/modules/open-ssh.nix index e723819..8c7e20c 100644 --- a/nixos/modules/open-ssh.nix +++ b/nixos/modules/open-ssh.nix @@ -11,4 +11,4 @@ AllowUsers = [ "bart" ]; }; }; -} +} \ No newline at end of file diff --git a/nixos/modules/printing.nix b/nixos/modules/printing.nix index 76fd488..fcfebbd 100644 --- a/nixos/modules/printing.nix +++ b/nixos/modules/printing.nix @@ -5,4 +5,4 @@ services.printing.enable = true; # Disable browsed: https://discourse.nixos.org/t/newly-announced-vulnerabilities-in-cups services.printing.browsed.enable = false; -} +} \ No newline at end of file diff --git a/nixos/modules/programming-languages.nix b/nixos/modules/programming-languages.nix index 6c5a3a8..0a224be 100644 --- a/nixos/modules/programming-languages.nix +++ b/nixos/modules/programming-languages.nix @@ -3,17 +3,11 @@ { environment.systemPackages = with pkgs; [ go - (python312Full.withPackages ( - ps: with ps; [ - pygobject3 - gobject-introspection - pyqt6-sip - ] - )) + (python312Full.withPackages(ps: with ps; [ pygobject3 gobject-introspection pyqt6-sip])) nodePackages_latest.nodejs nodePackages_latest.pnpm bun lua zig ]; -} +} \ No newline at end of file diff --git a/nixos/modules/screen.nix b/nixos/modules/screen.nix index 3d5dd06..487fe93 100644 --- a/nixos/modules/screen.nix +++ b/nixos/modules/screen.nix @@ -7,4 +7,4 @@ wlsunset brightnessctl ]; -} +} \ No newline at end of file diff --git a/nixos/modules/services.nix b/nixos/modules/services.nix index faa690c..170e56a 100644 --- a/nixos/modules/services.nix +++ b/nixos/modules/services.nix @@ -5,7 +5,7 @@ systemd.packages = with pkgs; [ auto-cpufreq ]; - + # Enable Services programs.direnv.enable = true; services.upower.enable = true; @@ -21,7 +21,7 @@ services.mpd.enable = true; programs.thunar.enable = true; programs.xfconf.enable = true; - services.tumbler.enable = true; + services.tumbler.enable = true; services.fwupd.enable = true; services.auto-cpufreq.enable = true; # services.gnome.core-shell.enable = true; @@ -53,4 +53,4 @@ wlogout gifsicle ]; -} +} \ No newline at end of file diff --git a/nixos/modules/sound.nix b/nixos/modules/sound.nix index ab183ea..749a758 100644 --- a/nixos/modules/sound.nix +++ b/nixos/modules/sound.nix @@ -22,4 +22,4 @@ pamixer pavucontrol ]; -} +} \ No newline at end of file diff --git a/nixos/modules/terminal-utils.nix b/nixos/modules/terminal-utils.nix index 4f04744..6685bdc 100644 --- a/nixos/modules/terminal-utils.nix +++ b/nixos/modules/terminal-utils.nix @@ -56,4 +56,4 @@ cava figlet ]; -} +} \ No newline at end of file diff --git a/nixos/modules/theme.nix b/nixos/modules/theme.nix index fb4142c..c5e953f 100644 --- a/nixos/modules/theme.nix +++ b/nixos/modules/theme.nix @@ -34,9 +34,9 @@ # Override packages nixpkgs.config.packageOverrides = pkgs: { - colloid-icon-theme = pkgs.colloid-icon-theme.override { colorVariants = [ "teal" ]; }; + colloid-icon-theme = pkgs.colloid-icon-theme.override { colorVariants = ["teal"]; }; catppuccin-gtk = pkgs.catppuccin-gtk.override { - accents = [ "teal" ]; # You can specify multiple accents here to output multiple themes + accents = [ "teal" ]; # You can specify multiple accents here to output multiple themes size = "standard"; variant = "macchiato"; }; @@ -59,4 +59,4 @@ # xsettingsd # themechanger ]; -} +} \ No newline at end of file diff --git a/nixos/modules/time.nix b/nixos/modules/time.nix index 3885f2c..5d4dc50 100644 --- a/nixos/modules/time.nix +++ b/nixos/modules/time.nix @@ -4,4 +4,4 @@ # Set your time zone. time.hardwareClockInLocalTime = true; time.timeZone = "Europe/Amsterdam"; -} +} \ No newline at end of file diff --git a/nixos/modules/usb.nix b/nixos/modules/usb.nix index 73df29e..63a70ff 100644 --- a/nixos/modules/usb.nix +++ b/nixos/modules/usb.nix @@ -22,4 +22,4 @@ environment.systemPackages = with pkgs; [ usbutils ]; -} +} \ No newline at end of file diff --git a/nixos/modules/users.nix b/nixos/modules/users.nix index 431621d..4e6f0d7 100644 --- a/nixos/modules/users.nix +++ b/nixos/modules/users.nix @@ -5,14 +5,7 @@ users.users.bart = { isNormalUser = true; description = "Bart van der Braak"; - extraGroups = [ - "networkmanager" - "input" - "wheel" - "video" - "audio" - "tss" - ]; + extraGroups = [ "networkmanager" "input" "wheel" "video" "audio" "tss" ]; shell = pkgs.bash; packages = with pkgs; [ spotify @@ -23,4 +16,4 @@ # Change runtime directory size services.logind.extraConfig = "RuntimeDirectorySize=8G"; -} +} \ No newline at end of file diff --git a/nixos/modules/virtualisation.nix b/nixos/modules/virtualisation.nix index 8328bf9..1234fc2 100644 --- a/nixos/modules/virtualisation.nix +++ b/nixos/modules/virtualisation.nix @@ -20,4 +20,4 @@ lazydocker docker-credential-helpers ]; -} +} \ No newline at end of file diff --git a/nixos/modules/vpn.nix b/nixos/modules/vpn.nix index c9d8d8c..67fd403 100644 --- a/nixos/modules/vpn.nix +++ b/nixos/modules/vpn.nix @@ -9,4 +9,4 @@ networkmanager-openvpn mullvad-closest ]; -} +} \ No newline at end of file diff --git a/nixos/modules/work.nix b/nixos/modules/work.nix index f735f56..a3bc54f 100644 --- a/nixos/modules/work.nix +++ b/nixos/modules/work.nix @@ -7,4 +7,4 @@ gnumake cmake ]; -} +} \ No newline at end of file diff --git a/nixos/packages.nix b/nixos/packages.nix index ae5599d..b1b23b2 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -1,9 +1,4 @@ -{ - pkgs, - inputs, - config, - ... -}: +{ pkgs, inputs, config, ... }: let customWallpaper = pkgs.fetchurl { @@ -12,29 +7,26 @@ let }; in { - environment.systemPackages = - with pkgs; - with inputs; - [ - inputs.zen-browser.packages."${system}".default - firefox - git - vim - wget - curl - fzf - jq - unzip - silver-searcher - ripgrep - wl-clipboard-rs - networkmanager-openvpn - (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" '' - [General] - background=${customWallpaper} - '') - dig - zig - spotify - ]; -} + environment.systemPackages = with pkgs; with inputs; [ + inputs.zen-browser.packages."${system}".default + firefox + git + vim + wget + curl + fzf + jq + unzip + silver-searcher + ripgrep + wl-clipboard-rs + networkmanager-openvpn + (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" '' + [General] + background=${customWallpaper} + '') + dig + zig + spotify + ]; +} \ No newline at end of file diff --git a/nixos/services.nix b/nixos/services.nix index 2db948b..973c435 100644 --- a/nixos/services.nix +++ b/nixos/services.nix @@ -13,17 +13,17 @@ # Enable PipeWire and ALSA support services.pipewire = { enable = true; - alsa.enable = true; # Enable ALSA support + alsa.enable = true; # Enable ALSA support alsa.support32Bit = true; # Support for 32-bit applications - pulse.enable = true; # Enable PulseAudio compatibility layer + pulse.enable = true; # Enable PulseAudio compatibility layer }; - + # Enable libinput for input device handling services.libinput.enable = true; # Enable security-related service for realtime audio tasks security.rtkit.enable = true; - + # Enable to update some devices' firmware services.fwupd.enable = true; @@ -40,4 +40,4 @@ services.printing.enable = true; services.printing.browsed.enable = false; hardware.bluetooth.enable = true; -} +} \ No newline at end of file diff --git a/nixos/users.nix b/nixos/users.nix index 7142b56..8842c70 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -4,12 +4,7 @@ users.users.bart = { isNormalUser = true; description = "Bart van der Braak"; - extraGroups = [ - "networkmanager" - "wheel" - "libvirtd" - "docker" - ]; + extraGroups = [ "networkmanager" "wheel" "libvirtd" "docker" ]; packages = with pkgs; [ vscodium thunderbird @@ -68,12 +63,9 @@ programs.virt-manager.enable = true; # Add Docker support - virtualisation.docker = { + virtualisation.docker.enable = true; + virtualisation.docker.rootless = { enable = true; - enableOnBoot = false; - rootless = { - enable = true; - setSocketVariable = true; - }; + setSocketVariable = true; }; -} +} \ No newline at end of file