diff options
| -rw-r--r-- | machines/firelink.nix | 52 | ||||
| -rw-r--r-- | modules/builder.nix | 6 | ||||
| -rw-r--r-- | modules/common.nix | 52 | ||||
| -rw-r--r-- | modules/desktop.nix | 30 |
4 files changed, 69 insertions, 71 deletions
diff --git a/machines/firelink.nix b/machines/firelink.nix index abe486b..392ffc1 100644 --- a/machines/firelink.nix +++ b/machines/firelink.nix @@ -24,7 +24,6 @@ in { orbekk.gaming.enable = true; orbekk.desktop.enable = true; - orbekk.monitoring-server.enable = true; orbekk.simple-firewall.allowedTCPPorts = [ # pulseaudio @@ -41,6 +40,7 @@ in kodi retroarch wmctrl # for steam launcher + openmw ]; nixpkgs.config.kodi = { enableAdvancedLauncher = true; @@ -113,42 +113,6 @@ in value = "1048576"; }]; - # virtualisation.libvirtd.enable = true; - # virtualisation.virtualbox.host.enable = true; - # virtualisation.virtualbox.host.enableExtensionPack = true; - - # services.jack = { - # jackd.enable = true; - # jackd.extraOptions = [ "-dalsa" "-dhw:M2" ]; - # alsa.enable = false; - # loopback.enable = true; - # }; - # users.extraUsers.guest.extraGroups = [ "jackaudio" ]; - # users.extraUsers.orbekk.extraGroups = [ "jackaudio" ]; - - # Streaming test - # services.nginx.enable = true; - # services.nginx.appendConfig = '' - # rtmp { - # server { - # listen 1935; - # chunk_size 4096; - # application live { - # live on; - # record off; - # } - # } - # } - # ''; - - #systemd.services.duckdns = { - # description = "Update orbekk.duckdns.org"; - # path = [ pkgs.curl ]; - # after = [ "network.target" ]; - # script = let token = (import ../duckdns-token.nix).token; in '' - # curl "https://www.duckdns.org/update?domains=orbekk&token=${token}&ip=" - # ''; - #}; systemd.timers.duckdns = { wantedBy = [ "timers.target" ]; timerConfig = { @@ -236,13 +200,9 @@ in # linux = pkgs.callPackage linux_pkg {}; # in pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux); - boot.kernelParams = ["amdgpu.dc=1"]; - + boot.kernelParams = []; networking.hostName = "firelink"; # Define your hostname. - # networking.interfaces.enp37s0.useDHCP = true; - # networking.interfaces.enp37s0.macAddress = "3c:97:0e:19:7e:5c"; - system.stateVersion = lib.mkForce "20.03"; # SSD configuration @@ -254,13 +214,6 @@ in boot.initrd.luks.devices."cryptsystem".device = "/dev/disk/by-uuid/8acc11c2-e540-4561-8c88-34176fca1a72"; boot.initrd.luks.devices."cryptsystem".allowDiscards = true; - # boot.initrd.luks.devices."cryptsystem".yubikey = { - # slot = 2; - # twoFactor = false; - # storage.device = "/boot"; - # }; - # boot.initrd.luks.cryptoModules = ["aes" "xts" "sha512"]; - # boot.initrd.luks.yubikeySupport = true; fileSystems."/boot" = { device = "/dev/disk/by-uuid/C636-D264"; @@ -268,7 +221,6 @@ in }; programs.ssh.askPassword = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; - services.xserver.desktopManager.plasma5.enable = true; # 60 fps services.xserver.xrandrHeads = diff --git a/modules/builder.nix b/modules/builder.nix index f4615ab..fb0740a 100644 --- a/modules/builder.nix +++ b/modules/builder.nix @@ -21,8 +21,8 @@ in }] ; nix.distributedBuilds = true; # optional, useful when the builder has a faster internet connection than yours - nix.extraOptions = '' - builders-use-substitutes = true - ''; + # nix.extraOptions = '' + # builders-use-substitutes = true + # ''; }; } diff --git a/modules/common.nix b/modules/common.nix index ae50055..49e376c 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -8,25 +8,61 @@ keycloak = pkgs.callPackage ../pkgs/keycloak/default.nix { }; }; - environment.shellAliases = { - vim = "nvim"; - }; + # TODO: replace with programs.neovim.enable + nixpkgs.overlays = [ + (final: prev: { + neovim = prev.neovim.override { + viAlias = true; + vimAlias = true; + }; + }) + ]; + environment.variables.EDITOR = "${pkgs.neovim}/bin/nvim"; + environment.systemPackages = with pkgs; [ + bat + bwm_ng + clang + coreutils + direnv dnsutils + emacs + exa + fd + fzf git + gitFull gnupg haskellPackages.hledger + hledger htop + iotop + ledger + moreutils mosh + most neovim + nix-index + p7zip pass + ripgrep + rustup silver-searcher - whois - unzip - p7zip + sqlite + stow unrar - iotop - moreutils + unzip + whois + zoxide + (rWrapper.override { + packages = with rPackages; [ + data_table + ggplot2 + hms + viridis + lubridate + ]; + }) ]; time.timeZone = "America/New_York"; diff --git a/modules/desktop.nix b/modules/desktop.nix index d15d906..5219e44 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -52,27 +52,39 @@ in }; environment.systemPackages = with pkgs; [ + (conky.override { pulseSupport = true; }) + anki + autorandr chromium + discord dmenu + dzen2 emacs - firefox + ffmpeg + firefox-bin haskellPackages.xmobar + hledger + hledger-ui + imagemagick + iw + ledger + networkmanagerapplet + nix-index pavucontrol + rofi rxvt_unicode-with-plugins + signal-desktop sshfsFuse + synergy trayer - (conky.override { pulseSupport = true; }) + vlc + wirelesstools xbindkeys xorg.xbacklight xorg.xev xscreensaver xsel # used by urxvt clipboard xss-lock - networkmanagerapplet - imagemagick - dzen2 - rofi - autorandr ]; i18n.inputMethod = { @@ -89,9 +101,7 @@ in # xkbVariant = "dvorak"; xkbOptions = "caps:ctrl_modifier"; - # desktopManager.plasma5 = { - # enable = true; - # }; + desktopManager.plasma5 = { enable = true; }; windowManager.xmonad = { enable = true; |