From 6dd1a60bcd933de154a907e94660d8ab7f748f49 Mon Sep 17 00:00:00 2001 From: Kyler Clay Date: Wed, 9 Oct 2024 22:24:38 -0400 Subject: [PATCH] Commit for generation 218 --- flake.lock | 4 +- glasshouse-desktop/configuration.nix | 116 +++++++++++------- .../nixvim/config/plugins/extra_plugins.nix | 42 +++++++ 3 files changed, 116 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index c0d8db6..80b724a 100644 --- a/flake.lock +++ b/flake.lock @@ -506,8 +506,8 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1728477685, - "narHash": "sha256-+6Wuh8HqJaDwFMVuMePA873exxVmSXnU5hy6EWSrLmo=", + "lastModified": 1728527041, + "narHash": "sha256-PmRJCfpY1PoJ3YP5IjCsQL1vc5zElFowAWJLjUwvlJc=", "path": "/home/pagedmov/sysflakes/glasshouse-desktop/dotfiles/packages/nixvim", "type": "path" }, diff --git a/glasshouse-desktop/configuration.nix b/glasshouse-desktop/configuration.nix index df961b9..6902cfc 100644 --- a/glasshouse-desktop/configuration.nix +++ b/glasshouse-desktop/configuration.nix @@ -2,16 +2,19 @@ { config, lib, pkgs, inputs, ... }: { + system.stateVersion = "24.05"; imports = [ ./hardware-configuration.nix ]; +## System - Environment ## + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; networking = { - networkmanager.enable = true; # Easiest to use and most distros use this by default. + networkmanager.enable = true; hostName = "glasshaus"; hosts = { "192.168.1.163" = [ "glasshaus.info" ]; @@ -22,17 +25,6 @@ }; }; - programs = { - zsh.enable = true; - nix-ld = { - enable = true; - libraries = with pkgs; [ - stdenv.cc.cc - ffmpeg-full - ]; - }; - }; - environment = { variables = { XCURSOR_SIZE = "24"; @@ -44,7 +36,6 @@ ]; }; - time.timeZone = "America/New_York"; i18n.defaultLocale = "en_US.UTF-8"; @@ -52,22 +43,45 @@ programs.steam.enable = true; home-manager.backupFileExtension = "backup"; -# Enable sound. - #hardware.pulseaudio.enable = true; -# OR +## Programs - Services - Hardware ## + + programs = { + zsh.enable = true; + nix-ld = { + enable = true; + libraries = with pkgs; [ + stdenv.cc.cc + ffmpeg-full + ]; + }; + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + }; services = { pipewire = { - enable = true; - pulse.enable = true; - wireplumber.enable = true; - alsa.enable = true; - alsa.support32Bit = true; - }; + enable = true; + pulse.enable = true; + wireplumber.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + }; udev.enable = true; dbus.enable = true; mullvad-vpn.enable = true; blueman.enable = true; + openssh.enable = true; + foundryvtt = { + enable = false; + hostName = "wumbodnd"; + package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_12; + minifyStaticFiles = true; + proxyPort = 443; + proxySSL = false; + upnp = false; + }; }; hardware = { @@ -78,57 +92,80 @@ powerOnBoot = true; }; }; + +## Users - Packages ## security.sudo.extraConfig = '' -pagedmov ALL=(ALL) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild + pagedmov ALL=(ALL) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild ''; users.users.pagedmov = { isNormalUser = true; shell = pkgs.zsh; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + extraGroups = [ "wheel" ]; }; nixpkgs.config.allowUnfree = true; - fonts.packages = with pkgs; [ times-newer-roman nerdfonts jetbrains-mono ]; + + fonts.packages = with pkgs; [ + times-newer-roman + nerdfonts + jetbrains-mono + ]; environment.systemPackages = with pkgs; [ + # a alsa-lib alsa-utils + # b bc + # c cava clang clang-tools cmake + # d + # e + # f fail2ban feh ffmpeg-full fuse fzf + # g git gnumake gst_all_1.gstreamer + # h htop hyprland hyprland-workspaces hyprpaper hyprpicker + # i imagemagick inetutils + # j + # k kitty + # l libclang libcxx lolcat lsof lua-language-server luarocks + # m mesa mpd mullvad + # n neofetch nix-index nix-prefetch-scripts nixos-option nix-search-cli + # o openssl + # p p7zip pamixer parted @@ -139,47 +176,38 @@ pagedmov ALL=(ALL) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild protonmail-bridge protontricks pyright + # q quintom-cursor-theme + # r + # s socat sox stress + # t tor tree + # u unrar unzip usbutils + # v vim vim vscode-langservers-extracted vulkan-loader + # w wget wine wineWowPackages.full wl-clipboard + # x xpad xwaylandvideobridge + # y + # z ]; -# List services that you want to enable: - -# Enable the OpenSSH daemon. - services.openssh.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - services.foundryvtt = { - enable = true; - hostName = "wumbodnd"; - package = inputs.foundryvtt.packages.${pkgs.system}.foundryvtt_12; - minifyStaticFiles = true; - proxyPort = 443; - proxySSL = false; - upnp = false; - }; - - system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/extra_plugins.nix b/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/extra_plugins.nix index b00d9c2..afa3ca2 100644 --- a/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/extra_plugins.nix +++ b/glasshouse-desktop/dotfiles/packages/nixvim/config/plugins/extra_plugins.nix @@ -1,6 +1,12 @@ { lib, pkgs, ... }: { +# need: +#vim-markdown +#vim-sneak +#vim-slash +#undotree +#automkdr.nvim extraPlugins = [ (pkgs.vimUtils.buildVimPlugin { # vimwiki name = "vimwiki"; @@ -11,5 +17,41 @@ hash = "sha256-Upx29rIPwW/e7Lkmf0PNOpIACnAXIzlkfa6V1p2nYHM="; }; }) + (pkgs.vimUtils.buildVimPlugin { + name = "vim-markdown"; + src = pkgs.fetchFromGitHub { + owner = "preservim"; + repo = "vim-markdown"; + rev = "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51"; + hash = "sha256-ZCCSjZ5Xok4rnIwfa4VUEaz6d3oW9066l0EkoqiTppM="; + }; + }) + (pkgs.vimUtils.buildVimPlugin { + name = "vim-sneak"; + src = pkgs.fetchFromGitHub { + owner = "justinmk"; + repo = "vim-sneak"; + rev = "c13d0497139b8796ff9c44ddb9bc0dc9770ad2dd"; + hash = "sha256-ndWhnV0fgCcqCGwVyM07GfmUB3CitBZbOWvZtsB1tBk="; + }; + }) + (pkgs.vimUtils.buildVimPlugin { + name = "vim-slash"; + src = pkgs.fetchFromGitHub { + owner = "junegunn"; + repo = "vim-slash"; + rev = "31aee09b7ea8893a18fa34f65e63e364fc998444"; + hash = "sha256-hC590lmKBssLCSKPF9O2cnt6TCJkklzbbhDNhf1ozUU="; + }; + }) + (pkgs.vimUtils.buildVimPlugin { + name = "automkdir.nvim"; + src = pkgs.fetchFromGitHub { + owner = "mateuszwieloch"; + repo = "automkdir.nvim"; + rev = "beeb2dd76f1c3ac776d901c43217a774f1f045de"; + hash = "sha256-lKSCZ80b/+OV56858FDK7x/zhcuU/AWuCDe+8NdhziU="; + }; + }) ]; }