From 4d16ca1d456fe268400cfc6390740b8b2ab63d41 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Fri, 26 Jan 2024 19:31:00 +0100 Subject: [PATCH] Done a whole bunch of things i forgot --- flake.lock | 18 +++---- home/lambda/config-files/wezterm.lua | 6 +-- home/lambda/default.nix | 31 ++++++----- hosts/asmodeus/default.nix | 65 ++++++++++++++++++----- hosts/asmodeus/hardware-configuration.nix | 4 ++ 5 files changed, 87 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 7115097..75338ff 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1704980875, - "narHash": "sha256-IPZmMjk5f4TBbEpzUFBc3OC1W6OwDNEXk2w/0uVXX1o=", + "lastModified": 1705659542, + "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f0ab0eedc6ede69beb8f45561ffefa54edc6e65", + "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", "type": "github" }, "original": { @@ -41,11 +41,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704874635, - "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", "type": "github" }, "original": { diff --git a/home/lambda/config-files/wezterm.lua b/home/lambda/config-files/wezterm.lua index c21facd..d3bc013 100644 --- a/home/lambda/config-files/wezterm.lua +++ b/home/lambda/config-files/wezterm.lua @@ -1,8 +1,8 @@ local config = {} -config.color_scheme = "Sakura" +config.color_scheme = "Catppuccin Mocha" config.font = wezterm.font 'Hack Nerd Font Mono' -config.font_size = 15 +config.font_size = 12 config.window_background_opacity = .8 --config.window_background_image = "/home/xqtc/dotfiles_new/walls/walls/SMT 40.png" @@ -38,7 +38,7 @@ end config.text_background_opacity = .4 config.enable_scroll_bar = false config.enable_tab_bar = true -config.enable_wayland = false +config.enable_wayland = true config.front_end = "OpenGL" config.warn_about_missing_glyphs = false return config diff --git a/home/lambda/default.nix b/home/lambda/default.nix index 9bd0a5a..33c9132 100644 --- a/home/lambda/default.nix +++ b/home/lambda/default.nix @@ -1,19 +1,23 @@ { config, pkgs, lib, ... }: { - home.username = "xqtc"; - home.homeDirectory = "/home/xqtc"; - - programs.git = { - enable = true; - userName = "xqtc161"; - userEmail = "xqtc@tutanota.com"; - }; - programs.wezterm = { - enable = true; - extraConfig = builtins.readFile ./config-files/wezterm.lua; - }; + home.username = "xqtc"; + home.homeDirectory = "/home/xqtc"; + + programs.git = { + enable = true; + userName = "xqtc161"; + userEmail = "xqtc@tutanota.com"; + }; + programs.wezterm = { + enable = true; + extraConfig = builtins.readFile ./config-files/wezterm.lua; + }; + #programs.dconf.enable = true; + #programs.easyeffects.enable = true; + #services.easyeffects.enable = true; programs = { + atuin = { enable = true; enableNushellIntegration = true; @@ -66,9 +70,12 @@ telegram-desktop #schildichat-desktop + neovide + yubioath-flutter steam + protonup-qt spotify sayonara diff --git a/hosts/asmodeus/default.nix b/hosts/asmodeus/default.nix index 2379643..fcc2412 100644 --- a/hosts/asmodeus/default.nix +++ b/hosts/asmodeus/default.nix @@ -42,7 +42,7 @@ nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.production; + package = config.boot.kernelPackages.nvidiaPackages.stable; }; # Use the systemd-boot EFI boot loader. @@ -71,11 +71,13 @@ # Enable the X11 windowing system. services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + #services.xserver.displayManager.gdm.enable = true; + #services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + services.xserver.displayManager.defaultSession = "plasmawayland"; services.xserver.videoDrivers = ["nvidia"]; - + virtualisation.docker.enable = true; # Configure keymap in X11 services.xserver.xkb.layout = "us"; @@ -86,7 +88,18 @@ # Enable sound. sound.enable = true; - hardware.pulseaudio.enable = true; + hardware.pulseaudio.enable = false; + + security.rtkit.enable = true; + services.pipewire = { + enable = true; + audio.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + jack.enable = true; + }; # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable = true; @@ -94,7 +107,7 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users.xqtc = { isNormalUser = true; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + extraGroups = [ "wheel" "sudo" "docker" ]; # Enable ‘sudo’ for the user. packages = with pkgs; [ wezterm nushell @@ -105,13 +118,26 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - wget - #git - firefox - neovim - gcc13 - cargo + vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + wget + #git + + firefox + + neovim + + gcc13 + + cargo + rustc + + wl-clipboard + xclip + + jellyfin + jellyfin-web + jellyfin-ffmpeg + ]; # Some programs need SUID wrappers, can be configured further or are @@ -124,10 +150,23 @@ # List services that you want to enable: + services.jellyfin.enable = true; + services.jellyfin.user = "xqtc"; + + # Enable the OpenSSH daemon. services.openssh.enable = true; + services.resolved.enable = true; + services.mullvad-vpn = { + enable = true; + package = pkgs.mullvad-vpn; + }; + + networking.wireguard.enable = true; + + services.tailscale.enable = true; # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/hosts/asmodeus/hardware-configuration.nix b/hosts/asmodeus/hardware-configuration.nix index 88d0226..88ed634 100644 --- a/hosts/asmodeus/hardware-configuration.nix +++ b/hosts/asmodeus/hardware-configuration.nix @@ -23,6 +23,10 @@ fsType = "vfat"; }; + fileSystems."/mnt" = + { device = "/dev/disk/by-uuid/bc68de4c-ad5c-4016-ac11-65de448949fe"; + fsType = "ext4"; + }; swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking