From 5e4a1b08c5adaec55dff6fa8119346610b2d80e8 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Tue, 19 Mar 2024 22:08:38 +0100 Subject: [PATCH] some fuckery with wezterm and stuff i dunno anymore and i really need to sleep honk shoooooo --- common/default.nix | 2 +- flake.lock | 36 +++++++-------- home/config-files/wezterm.lua | 23 ++++++++++ home/modules/gtk.nix | 11 +++++ hosts/aarch64-linux/alastor/default.nix | 46 +++++++++++++------ .../alastor/hardware-configuration.nix | 7 ++- 6 files changed, 92 insertions(+), 33 deletions(-) diff --git a/common/default.nix b/common/default.nix index 05e46e2..a616df6 100644 --- a/common/default.nix +++ b/common/default.nix @@ -7,7 +7,7 @@ }: { #nixpkgs.config.permittedInsecurePackages = ["electron-25.9.0" "electron-24.8.6"]; nix.settings = { - trusted-users = [ "xqtc" ]; + trusted-users = ["xqtc"]; substituters = [ "https://nix-community.cachix.org" ]; diff --git a/flake.lock b/flake.lock index 1fd8120..8e78b5a 100644 --- a/flake.lock +++ b/flake.lock @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1710714957, - "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", + "lastModified": 1710796387, + "narHash": "sha256-ve/vpbby+4LPJrlNGqGyuzZMLL7zHUZhvvKu1StsaC8=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", + "rev": "baf7659448ffa6ab6870dba1ca681a4868c3068a", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1710281778, - "narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=", + "lastModified": 1710714957, + "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", "owner": "nix-community", "repo": "home-manager", - "rev": "49a266d2ca59df8a03249550e73a54626181b65d", + "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", "type": "github" }, "original": { @@ -270,11 +270,11 @@ ] }, "locked": { - "lastModified": 1710281379, - "narHash": "sha256-uFo9hxt982L3nFJeweW4Gip2esiGrIQlbvEGrNTh4AY=", + "lastModified": 1710717205, + "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "d9ea313bc4851670dc99c5cc979cb79750e7d670", + "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "type": "github" }, "original": { @@ -285,11 +285,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1710622004, - "narHash": "sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0=", + "lastModified": 1710783728, + "narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "968952f950a59dee9ed1e8799dda38c6dfa1bad3", + "rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388", "type": "github" }, "original": { @@ -317,11 +317,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1710743772, - "narHash": "sha256-u2DncftQZEZElNeJIHkRHkq+1e/+z4c1bKCGan0LVcg=", + "lastModified": 1710797693, + "narHash": "sha256-TvIMBhgfDlYDC7CAmO8oLU4OLqVTGf1ePv50HFoKWTY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3fd69b2616bf555b1de1b5e4585c125951ee018", + "rev": "cf0327ca4ddb15907d25f7dc5b9e6663ff8df4cb", "type": "github" }, "original": { @@ -376,11 +376,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1710634405, - "narHash": "sha256-e+EHQGqqjpvkln6vYmiAcafFKbTaze3XF7DEjDZyXGY=", + "lastModified": 1710790872, + "narHash": "sha256-Y461cP8iiWycPCREOGb5zhz3bj57PNb0Uc4cwygOMKM=", "owner": "nix-community", "repo": "nixvim", - "rev": "939530edca29b44e65d8bd606ef3485346510ebe", + "rev": "303b9ca2c0c043ccd0e33aae0960d26f24cf5088", "type": "github" }, "original": { diff --git a/home/config-files/wezterm.lua b/home/config-files/wezterm.lua index fb004f6..b134adb 100644 --- a/home/config-files/wezterm.lua +++ b/home/config-files/wezterm.lua @@ -21,6 +21,11 @@ config.keys = { mods = 'CTRL', action = wezterm.action.SpawnTab 'DefaultDomain', }, + { + key = 's', + mods = 'CTRL | SHIFT', + action = wezterm.action.PaneSelect + }, { key = "LeftArrow", mods = 'CTRL | SHIFT', @@ -60,6 +65,24 @@ for i = 1, 8 do }) end +wezterm.on('update-status', function(window, pane) + local date = wezterm.strftime '%a %b %-d %H:%M:%S |' + + local bat = '' + for _, b in ipairs(wezterm.battery_info()) do + bat = '|🔋 ' .. string.format('%.0f%%', b.state_of_charge * 100) .. ' | ' + end + + window:set_right_status(wezterm.format { + { Text = bat .. date }, + }) +end) +wezterm.on('update-status', function(window, pane) + window:set_left_status(wezterm.format { + { Text = '| λ |' }, + }) +end) + config.hide_tab_bar_if_only_one_tab = true config.use_fancy_tab_bar = false config.text_background_opacity = .4 diff --git a/home/modules/gtk.nix b/home/modules/gtk.nix index 5324c62..1f0b3e0 100644 --- a/home/modules/gtk.nix +++ b/home/modules/gtk.nix @@ -22,5 +22,16 @@ variant = "mocha"; }; }; + #gtk3.extraConfig = { + # Settings = '' + # gtk-application-prefer-dark-theme=1 + # ''; + #}; + gtk4.extraConfig = { + Settings = '' + gtk-application-prefer-dark-theme=1 + ''; + }; }; + home.sessionVariables.GTK_THEME = "palenight"; } diff --git a/hosts/aarch64-linux/alastor/default.nix b/hosts/aarch64-linux/alastor/default.nix index 5082b17..47bafa5 100644 --- a/hosts/aarch64-linux/alastor/default.nix +++ b/hosts/aarch64-linux/alastor/default.nix @@ -11,7 +11,6 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - #./apple-silicon-support inputs.apple-silicon.nixosModules.apple-silicon-support ../../../common #../../antivirus.nix @@ -21,7 +20,9 @@ nixpkgs.config.allowUnfree = true; hardware.asahi.peripheralFirmwareDirectory = ./firmware; hardware.asahi.useExperimentalGPUDriver = true; - hardware.asahi.experimentalGPUInstallMode = "overlay"; + # TODO: this is UGLY + # only builds with `--impure` which SUCKS I HATE THIS RAAAH + hardware.asahi.experimentalGPUInstallMode = "replace"; hardware.asahi.withRust = true; hardware.opengl.enable = true; hardware.opengl.driSupport = true; @@ -40,7 +41,7 @@ # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; + time.timeZone = "Europe/Berlin"; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; @@ -56,8 +57,9 @@ # Enable the X11 windowing system. services.xserver.enable = true; - services.xserver.desktopManager.plasma6.enable = true; - services.xserver.displayManager.sddm.enable = true; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + # Configure keymap in X11 # services.xserver.xkb.layout = "us"; @@ -67,16 +69,27 @@ # services.printing.enable = true; # Enable sound. - # sound.enable = true; + sound.enable = true; # hardware.pulseaudio.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + security.polkit.enable = true; + services.pipewire = { + 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; + services.xserver.libinput.enable = true; # 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" "audio"]; # Enable ‘sudo’ for the user. packages = with pkgs; [ tree ]; @@ -102,18 +115,25 @@ wl-clipboard xclip + gnomeExtensions.appindicator + gnomeExtensions.tray-icons-reloaded + gnomeExtensions.blur-my-shell + jellyfin jellyfin-web jellyfin-ffmpeg ]; + services.udev.packages = with pkgs; [gnome.gnome-settings-daemon]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; + programs.mtr.enable = true; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + services.resolved.enable = true; programs.dconf.enable = true; # List services that you want to enable: diff --git a/hosts/aarch64-linux/alastor/hardware-configuration.nix b/hosts/aarch64-linux/alastor/hardware-configuration.nix index ced1edf..1f78e79 100644 --- a/hosts/aarch64-linux/alastor/hardware-configuration.nix +++ b/hosts/aarch64-linux/alastor/hardware-configuration.nix @@ -27,7 +27,12 @@ fsType = "vfat"; }; - swapDevices = []; + swapDevices = [ + { + device = "/var/lib/swapfile"; + size = 8 * 1024; + } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's