diff --git a/configs/common.nix b/configs/common.nix index 7d11206..fadaf81 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -11,7 +11,8 @@ /etc/nixos/hardware-configuration.nix ]; - # Allow Nix command and flakes (ofc) + # Nix settings + ## Limit Cores on rebuild and enable Flakes nix.settings = { cores = 6; experimental-features = [ @@ -20,7 +21,7 @@ ]; }; - # Allow unfree packages + ## Allow unfree packages and add pkgs.unstable nixpkgs = { config = { allowUnfree = true; @@ -34,7 +35,7 @@ }; }; - # Nix store shit + ## Optimise Nix store on rebuild and collect garbage as a service nix.optimise.automatic = true; nix.gc = { automatic = true; @@ -42,7 +43,7 @@ options = "--delete-older-than 5d"; }; - # Boot + # Bootloader theming and plymouth boot = { loader = { timeout = 2; @@ -67,9 +68,13 @@ }; }; - # Use latest kernel. + ## Use latest kernel boot.kernelPackages = pkgs.linuxPackages_latest; + # Bluetooth and Networking + hardware.bluetooth.enable = true; + hardware.xpadneo.enable = true; + networking.networkmanager.enable = true; networking.networkmanager.dns = "none"; networking.nameservers = [ @@ -77,14 +82,8 @@ "8.8.8.8" ]; - # Enable bluetooth - hardware.bluetooth.enable = true; - hardware.xpadneo.enable = true; - - # Set your time zone. - time.timeZone = "Europe/London"; - # Locale + time.timeZone = "Europe/London"; i18n.defaultLocale = "en_GB.UTF-8"; i18n.extraLocaleSettings = { LC_ADDRESS = "en_GB.UTF-8"; @@ -98,23 +97,23 @@ LC_TIME = "en_GB.UTF-8"; }; - # Windowing Systems - services.xserver.enable = true; - - programs.hyprland = { - enable = true; - package = pkgs.unstable.hyprland; - }; - security.polkit.enable = true; - - # Keymap + # Userspace Stuff + ## Keymap services.xserver.xkb = { layout = "gb"; variant = ""; }; console.keyMap = "uk"; - # Pipewire + ## Desktop + services.xserver.enable = true; + programs.hyprland = { + enable = true; + package = pkgs.unstable.hyprland; + }; + security.polkit.enable = true; + + ## Audio Server services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -125,6 +124,7 @@ }; # Local User + ## User config users.users.user01 = { isNormalUser = true; shell = pkgs.zsh; @@ -165,21 +165,18 @@ in [ # Ricing + ## Desktop bibata-cursors catppuccin-gtk waybar hyprlock - cava - cmatrix swaynotificationcenter - (input { - package = "chataigne"; - }) wlogout wpaperd - kando - oh-my-posh + + ## Desktop Utilities grimblast + wl-clipboard (wrap { name = "otter-launcher"; pkg = ( @@ -192,58 +189,64 @@ jq ]; }) - (input { - package = "fsel"; - }) + (input { package = "fsel"; }) # Terminal - carapace - bat + ## Styling / Functionality kitty - wl-clipboard + oh-my-posh + carapace + zsh-autocomplete + bat + + ## Tools + lazygit p7zip-rar + fzf + ripgrep wget + htop playerctl git - fastfetch - zellij lsd (input { package = "doot"; }) - fzf - ripgrep - zsh-autocomplete - nodejs - lazygit - tailscale - unstable.norgolith - # Thunar stuff - xfce.thunar - xfce.thunar-volman - xfce.thunar-vcs-plugin - xfce.thunar-archive-plugin + ## Other CLI Apps + nodejs + fastfetch + zellij + cava + cmatrix + tailscale + syncthing + unstable.norgolith + jellyfin-tui # Apps - pavucontrol + ## Actual Useful Stuff + nemo firefox - htop - input-remapper - tor-browser gotify-desktop - techmino + pavucontrol mpv + input-remapper + + ## Other Nonsense + tor-browser + techmino prismlauncher delfin onlyoffice-desktopeditors - syncthing blueman - jellyfin-tui + (input { + package = "chataigne"; + }) ]; }; - # Zsh + ## Zsh programs.zsh = { enable = true; enableCompletion = true; @@ -261,11 +264,11 @@ }; }; - # User programs + ## User programs programs.dconf.enable = true; programs.xfconf.enable = true; - # User Services + ## User Services services.gvfs.enable = true; services.input-remapper.enable = true; services.tailscale.enable = true; @@ -274,36 +277,30 @@ services.openssh.enable = true; services.avahi.enable = true; - # Fonts + ## Fonts fonts.packages = with pkgs; [ nerd-fonts.fira-mono ]; - fonts.fontconfig.defaultFonts.serif = [ "Fira Mono Nerd Font" ]; + + # System Packages environment.systemPackages = with pkgs; [ + # Utilities inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default vim unzip - python310 # Its python like come on + python310 usbutils curlWithGnuTls - # Graphics Drivers + # System mesa vulkan-tools - - # FileSystem Dependancies gvfs - - # C copmpiler clang - - # XDG Desktop Portal Etc xdg-desktop-portal xdg-desktop-portal-hyprland - - # Other things (from gnome) glib gnutls liblzf diff --git a/flake.lock b/flake.lock index 73160e7..4ff763d 100644 --- a/flake.lock +++ b/flake.lock @@ -116,11 +116,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1773279064, - "narHash": "sha256-BLcSfp2aNm+0oDoHbvTufBRS2XwKqbIeUOXD8t58efE=", + "lastModified": 1773964968, + "narHash": "sha256-/vojK9noVTM+aWl+gX/vFjREtYcp0TGflBmQ1B4oIIk=", "owner": "Mjoyufull", "repo": "fsel", - "rev": "7b38c6223eed6e509f98e066ff89f481bd1930d7", + "rev": "c8f9b8080b2ea87d2c0fa6ea4d2bd6b96c154f38", "type": "github" }, "original": { @@ -282,11 +282,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1773222311, - "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", + "lastModified": 1773964973, + "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0590cd39f728e129122770c029970378a79d076a", + "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", "type": "github" }, "original": { @@ -365,10 +365,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1772709070, - "narHash": "sha256-HXlGlbDVKMdw1ENgYu6gM3jyw+nPoam25SsgzRhtEG8=", - "rev": "68a7427e800f07d09a85a6014006d67c9350eaeb", - "revCount": 50, + "lastModified": 1774179420, + "narHash": "sha256-RkiN/X22AfHQCkIm5y/4GjBc07pOjhAqMFvqIGTKyGE=", + "ref": "refs/heads/main", + "rev": "1d69673e62cc5072543476f08df3f3432239d6d9", + "revCount": 53, "type": "git", "url": "file:///home/user01/.dotfiles/.config/nvim" }, @@ -385,11 +386,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1771555910, - "narHash": "sha256-tTqkVD4c8JK5UILju9IF9cXa7eP1S+mehnjWmVHb3sA=", + "lastModified": 1773647611, + "narHash": "sha256-Dkb6ft4LNHiYpmzJ9O90Qg3Jv2VThtzlC88bIAgVTWM=", "owner": "kuokuo123", "repo": "otter-launcher", - "rev": "c07b437da5fd466d5eb511fc7a3a2b373c51747c", + "rev": "5aea41193a8da76c4720ec11059d56eb2fd86de1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 31433fe..f2472e5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,22 +2,24 @@ description = "Master flake for Voidarc nix config"; inputs = { + # System nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; - - sls-steam = { - url = "github:AceSLS/SLSsteam"; + nvim-wrapped = { + url = "git+file:///home/user01/.dotfiles/.config/nvim"; + inputs.nixpkgs.follows = "nixpkgs"; }; + # Apps + sls-steam.url = "github:AceSLS/SLSsteam"; chataigne.url = "./modules/chataigne"; - nvim-wrapped.url = "git+file:///home/user01/.dotfiles/.config/nvim"; - - tree-sitter.url = "github:tree-sitter/tree-sitter?ref=8b8199775f96ca8642cf7860da46100875b38453"; + # Utils doot.url = "github:voidarclabs/nixos.doot"; way-edges.url = "github:way-edges/way-edges"; otter-launcher.url = "github:kuokuo123/otter-launcher"; fsel.url = "github:Mjoyufull/fsel"; + # Davinci-resolve mesa-davinci.url = "github:nixos/nixpkgs?ref=599ddd2b79331c1e6153e1659bdaab65d62c4c82"; };