From b8a9ad66c99e04c67620d40e57ecb32d79255845 Mon Sep 17 00:00:00 2001 From: vali Date: Wed, 10 Apr 2024 21:15:15 +0200 Subject: [PATCH] fixed zsh problems, schizofox not working --- alt/flake.lock | 296 -------------------- alt/flake.nix | 60 ---- alt/home/vali/laptop.nix | 27 -- alt/home/vali/xfce.nix | 18 -- alt/hosts/common/default.nix | 93 ------ alt/hosts/common/packages.nix | 23 -- alt/hosts/laptop/default.nix | 13 - alt/hosts/laptop/hardware-configuration.nix | 39 --- alt/hosts/laptop/packages.nix | 28 -- alt/hosts/xfce/default.nix | 22 -- alt/hosts/xfce/hardware-configuration.nix | 39 --- alt/hosts/xfce/packages.nix | 27 -- alt/modules/terminal/zsh/home.nix | 31 -- alt/modules/web/schizofox.nix | 72 ----- hosts/vali/configuration.nix | 1 + hosts/vali/programs.nix | 1 + modules/cli/zsh.nix | 10 +- modules/terminal/st.nix | 0 modules/terminal/starship.nix | 0 modules/terminal/zsh.nix | 0 20 files changed, 10 insertions(+), 790 deletions(-) delete mode 100755 alt/flake.lock delete mode 100755 alt/flake.nix delete mode 100755 alt/home/vali/laptop.nix delete mode 100755 alt/home/vali/xfce.nix delete mode 100755 alt/hosts/common/default.nix delete mode 100755 alt/hosts/common/packages.nix delete mode 100755 alt/hosts/laptop/default.nix delete mode 100755 alt/hosts/laptop/hardware-configuration.nix delete mode 100755 alt/hosts/laptop/packages.nix delete mode 100755 alt/hosts/xfce/default.nix delete mode 100755 alt/hosts/xfce/hardware-configuration.nix delete mode 100755 alt/hosts/xfce/packages.nix delete mode 100755 alt/modules/terminal/zsh/home.nix delete mode 100755 alt/modules/web/schizofox.nix delete mode 100644 modules/terminal/st.nix delete mode 100644 modules/terminal/starship.nix delete mode 100644 modules/terminal/zsh.nix diff --git a/alt/flake.lock b/alt/flake.lock deleted file mode 100755 index 57fc2c7..0000000 --- a/alt/flake.lock +++ /dev/null @@ -1,296 +0,0 @@ -{ - "nodes": { - "crane": { - "inputs": { - "nixpkgs": [ - "schizofox", - "searx-randomizer", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1701386725, - "narHash": "sha256-w4aBlMYh9Y8co1V80m5LzEKMijUJ7CBTq209WbqVwUU=", - "owner": "ipetkov", - "repo": "crane", - "rev": "8b9bad9b30bd7a9ed08782e64846b7485f9d0a38", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "schizofox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": [ - "schizofox", - "nixpak", - "flake-parts" - ], - "nixpkgs": [ - "schizofox", - "nixpak", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704029560, - "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712462372, - "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "schizofox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708591310, - "narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nixpak": { - "inputs": { - "flake-parts": [ - "schizofox", - "flake-parts" - ], - "hercules-ci-effects": "hercules-ci-effects", - "nixpkgs": [ - "schizofox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708597894, - "narHash": "sha256-KxpKOBDGPJ76k37vLukYHp/wd7U4DoUVIvy8atHfy/k=", - "owner": "nixpak", - "repo": "nixpak", - "rev": "535dd408c4b19f407bc22e42eb32ccb9256e5865", - "type": "github" - }, - "original": { - "owner": "nixpak", - "repo": "nixpak", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nur": { - "locked": { - "lastModified": 1712435091, - "narHash": "sha256-Hyn/2goBwkDGxTF6IBcc1HpRscpLg8ErEy+vmQwEqoc=", - "owner": "nix-community", - "repo": "NUR", - "rev": "d47aa79f2aae0bea15c6a40b7fca5830fcfe1346", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "nur": "nur", - "schizofox": "schizofox" - } - }, - "schizofox": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "home-manager": "home-manager_2", - "nixpak": "nixpak", - "nixpkgs": "nixpkgs_2", - "searx-randomizer": "searx-randomizer" - }, - "locked": { - "lastModified": 1710502118, - "narHash": "sha256-kPzvCwGVuLlPDVRD35dMnudWPpEzRXfU/9DHsG12PaY=", - "owner": "schizofox", - "repo": "schizofox", - "rev": "8dde2033a6f448c48a48d4d0aeb22bf2da840b7d", - "type": "github" - }, - "original": { - "owner": "schizofox", - "repo": "schizofox", - "type": "github" - } - }, - "searx-randomizer": { - "inputs": { - "crane": "crane", - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "schizofox", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704412376, - "narHash": "sha256-Ap/AudJxCYBDWYy0lyqP0/FZYJCibL7jKkoj6hp1WS0=", - "owner": "schizofox", - "repo": "searx-randomizer", - "rev": "c36a473732ba6b4f6024ac1c181631cf4d542b17", - "type": "github" - }, - "original": { - "owner": "schizofox", - "repo": "searx-randomizer", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/alt/flake.nix b/alt/flake.nix deleted file mode 100755 index 95e786a..0000000 --- a/alt/flake.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - description = "My NixOS configuration"; - - inputs = { - nixpkgs.url= "github:nixos/nixpkgs/nixos-unstable"; - nur.url = "github:nix-community/NUR"; - schizofox.url="github:schizofox/schizofox"; - home-manager = { - url = "github:nix-community/home-manager/"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = inputs @ { self, nixpkgs, nur, home-manager, ...}: - let - inherit (self) outputs; - mkSystem = { - hostname, - modules ? [], - user-configs ? [ { name = "vali"; config = ./home/vali/common.nix; }], - system ? "x86_64-linux" - #overlays ? import -/overlays/packages.nix - }: - let - profile-config = { inherit hostname system modules user-configs; }; - in - nixpkgs.lib.nixosSystem { - inherit modules; - specialArgs = { inherit inputs outputs profile-config; }; - }; - - mkHome = user: modules: pkgs: home-manager.lib.homeManagerConfiguration { - inherit modules pkgs user; - extraSpecialArgs = { inherit inputs outputs user; }; - }; - in { - nixpkgs.config.allowUnfree = true; - nixosConfigurations = { - laptop = mkSystem { - hostname = "nixos"; - modules = [./hosts/laptop]; - user-configs = [{ - name = "vali"; - config = ./home/vali/laptop.nix; - }]; - }; - xfce = mkSystem { - hostname = "nixos"; - modules = [ ./hosts/xfce ]; - user-configs = [{ - name = "vali"; - config = ./home/vali/xfce.nix; - }]; - }; - }; - homeManagerConfiguration = { - "vali@laptop" = mkHome "vali" [ home/vali/laptop.nix ] nixpkgs.legacyPackages."x86_64-linux"; - }; - }; -} diff --git a/alt/home/vali/laptop.nix b/alt/home/vali/laptop.nix deleted file mode 100755 index e9ac02c..0000000 --- a/alt/home/vali/laptop.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ inputs, outputs, pkgs, user, ... }: - -{ - imports = [ - # Would look like this: - # ../../terminal/zsh/home.nix - inputs.schizofox.homeManagerModule - ../../modules/web/schizofox.nix - #../../modules/terminal/zsh/home.nix - ]; - xdg.configHome = "/home/${user}/.config/"; - programs.home-manager.enable = true; - home = { - stateVersion = "23.11"; - username = "${user}"; - homeDirectory = "/home/${user}"; - }; - - # GNOME settings: - dconf.settings = { - "org/gnome/shell" = { - disable-user-extensions = false; - enabled-extensions = [ "appindicatorsupport@rgcjonas.gmail.com" ]; - }; - "org/gnome/desktop/interface".color-scheme = "prefer-dark"; - }; -} diff --git a/alt/home/vali/xfce.nix b/alt/home/vali/xfce.nix deleted file mode 100755 index 814755e..0000000 --- a/alt/home/vali/xfce.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ inputs, outputs, pkgs, user, ... }: - -{ - imports = [ - # Would look like this: - # ../../terminal/zsh/home.nix - inputs.schizofox.homeManagerModule - ../../modules/web/schizofox.nix - #../../modules/terminal/zsh/home.nix - ]; - xdg.configHome = "/home/${user}/.config/"; - programs.home-manager.enable = true; - home = { - stateVersion = "23.11"; - username = "${user}"; - homeDirectory = "/home/${user}"; - }; -} diff --git a/alt/hosts/common/default.nix b/alt/hosts/common/default.nix deleted file mode 100755 index e65e5ae..0000000 --- a/alt/hosts/common/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ inputs, outputs, profile-config, pkgs, ... }: - -{ - nixpkgs.config.allowUnfree = true; - imports = [ - #profile-config.overlays - inputs.home-manager.nixosModules.home-manager - ./packages.nix - ]; - - services.locate = { - enable = true; - interval = "daily"; - package = pkgs.plocate; - localuser = null; - }; - - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - - home-manager.users = builtins.listToAttrs (builtins.map( - u-conf: { - inherit inputs; - name = u-conf.name; - value = import u-conf.config { inherit pkgs inputs outputs; user = u-conf.name; }; - } - )profile-config.user-configs); - - users.users = builtins.listToAttrs (builtins.map( - u-conf: { - name = u-conf.name; - value = { - initialPassword = "${u-conf.name}"; - isNormalUser = true; - extraGroups = [ "wheel" "audio" "video" "input"]; - }; - } - )profile-config.user-configs); - - boot.loader = { - efi.canTouchEfiVariables = true; - grub = { - enable = true; - efiSupport = true; - device = "nodev"; - }; - }; - - time.timeZone = "Europe/Zurich"; - i18n.defaultLocale = "en_US.UTF-8"; - console.keyMap = "de"; - # Remove unnecessary packages - environment.gnome.excludePackages = - (with pkgs; [ - gnome-photos - gnome-tour - gedit - ]) ++ - (with pkgs.gnome; [ - epiphany - geary - totem - tali - iagno - hitori - atomix - ]); - services.xserver.excludePackages = [ pkgs.xterm ]; - documentation.nixos.enable = false; - # Set the keyboard layout to german - services.xserver.xkb.layout= "de"; - # Eable CUPS - services.printing.enable = true; - # Sound settings - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - jack.enable = true; - pulse.enable = true; - wireplumber.enable = true; - alsa.support32Bit = true; - }; - services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; - - nix = { - package = pkgs.nixFlakes; - extraOptions = "experimental-features = nix-command flakes"; - }; - system.stateVersion = "23.11"; -} diff --git a/alt/hosts/common/packages.nix b/alt/hosts/common/packages.nix deleted file mode 100755 index 512098b..0000000 --- a/alt/hosts/common/packages.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ inputs, outputs, profile-config, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - vim - neovim - eza - zsh - git - zip - unzip - neofetch - fastfetch - wget - zoxide - python3 - gcc - htop - networkmanager - gnomeExtensions.appindicator - uwufetch - ]; -} diff --git a/alt/hosts/laptop/default.nix b/alt/hosts/laptop/default.nix deleted file mode 100755 index 70b2af3..0000000 --- a/alt/hosts/laptop/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ inputs, outputs, pks, profile-config, ... }: - -{ - imports = [ - ./hardware-configuration.nix - ../common - ./packages.nix - ]; - services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - security.polkit.enable = true; -} diff --git a/alt/hosts/laptop/hardware-configuration.nix b/alt/hosts/laptop/hardware-configuration.nix deleted file mode 100755 index 50ae60d..0000000 --- a/alt/hosts/laptop/hardware-configuration.nix +++ /dev/null @@ -1,39 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/b29322ae-b475-4241-85d5-16b69d3cbdc0"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-d12a57e8-f071-485c-ab1c-e8f7a7897dfb".device = "/dev/disk/by-uuid/d12a57e8-f071-485c-ab1c-e8f7a7897dfb"; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/33F4-58C3"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - # 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 - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp59s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/alt/hosts/laptop/packages.nix b/alt/hosts/laptop/packages.nix deleted file mode 100755 index 3aa4de0..0000000 --- a/alt/hosts/laptop/packages.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ inputs, outputs, pkgs, profile-config, ... }: - -{ - environment.systemPackages = with pkgs; [ - jetbrains.idea-community - ani-cli - okular - texliveFull - signal-desktop - nextcloud-client - vlc - strawberry - telegram-desktop - thunderbird - betterbird - vesktop - zsh - zoxide - eza - mpv - librewolf - keepassxc - feh - libreoffice - openjdk - gnome.gnome-tweaks - ]; -} diff --git a/alt/hosts/xfce/default.nix b/alt/hosts/xfce/default.nix deleted file mode 100755 index f02b850..0000000 --- a/alt/hosts/xfce/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, pkgs, callPackage, ... }: -{ - imports = [ - ./hardware-configuration.nix - ./packages.nix - ../common - ]; - services.xserver = { - enable = true; - desktopManager = { - xterm.enable = false; - xfce = { - enable = true; - noDesktop = true; - enableXfwm = false; - }; - }; - displayManager.defaultSession = "xfce"; - windowManager.i3.enable = true; - }; - ... -} diff --git a/alt/hosts/xfce/hardware-configuration.nix b/alt/hosts/xfce/hardware-configuration.nix deleted file mode 100755 index 50ae60d..0000000 --- a/alt/hosts/xfce/hardware-configuration.nix +++ /dev/null @@ -1,39 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/b29322ae-b475-4241-85d5-16b69d3cbdc0"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-d12a57e8-f071-485c-ab1c-e8f7a7897dfb".device = "/dev/disk/by-uuid/d12a57e8-f071-485c-ab1c-e8f7a7897dfb"; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/33F4-58C3"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - # 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 - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp59s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/alt/hosts/xfce/packages.nix b/alt/hosts/xfce/packages.nix deleted file mode 100755 index 4e0c9e1..0000000 --- a/alt/hosts/xfce/packages.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ inputs, outputs, pkgs, profile-config, ... }: - -{ - environment.systemPackages = with pkgs; [ - jetbrains.idea-community - ani-cli - okular - texliveFull - signal-desktop - nextcloud-client - vlc - strawberry - telegram-desktop - betterbird - vesktop - zsh - zoxide - eza - mpv - librewolf - keepassxc - feh - libreoffice - openjdk - - ]; -} diff --git a/alt/modules/terminal/zsh/home.nix b/alt/modules/terminal/zsh/home.nix deleted file mode 100755 index accc345..0000000 --- a/alt/modules/terminal/zsh/home.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ pkgs, config, ... } - -{ - programs.zsh = { - enable = true; - enableCompletion = true; - enableAutoSuggestions = true; - - shellAliases = { - c = "clear"; - cc = "cd && clear"; - la = "eza -lah"; - ls = "eza" - update = "sudo nixos-rebuild switch --flake '/home/vali/.flake/'#laptop"; - nv = "nvim"; - sunv = "sudo nvim"; - }; - history.size = 10000; - history.path = "${config.xdg.dataHome}/zsh/history"; - - oh-my-zsh = { - enable = true; - plugins = [ "git" "thefuck" ]; - }; - home.packages = with pkgs; [ thefuck ]; - programs.zoxide = { - enable = true; - enableZshIntegration = true; - } - } -} diff --git a/alt/modules/web/schizofox.nix b/alt/modules/web/schizofox.nix deleted file mode 100755 index b86f330..0000000 --- a/alt/modules/web/schizofox.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ pkgs, inputs, ... }: { -#imports = [ inputs.schizofox.homeManagerModule ]; -programs.schizofox = { - enable = true; - - theme = { - colors = { - background-darker = "181825"; - background = "1e1e2e"; - foreground = "cdd6f4"; - }; - - font = "Lexend"; - - extraUserChrome = '' - body { - color: red !important; - } - .urlbarView { - display: none !important; - } - ''; - }; - - search = { - defaultSearchEngine = "Brave"; - removeEngines = ["Google" "Bing" "Amazon.com" "eBay" "Twitter" "Wikipedia"]; - searxUrl = "https://searx.be"; - searxQuery = "https://searx.be/search?q={searchTerms}&categories=general"; - addEngines = [ - { - Name = "Etherscan"; - Description = "Checking balances"; - Alias = "!eth"; - Method = "GET"; - URLTemplate = "https://etherscan.io/search?f=0&q={searchTerms}"; - } - ]; - }; - - security = { - sanitizeOnShutdown = false; - sandbox = true; - userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:106.0) Gecko/20100101 Firefox/106.0"; - }; - - misc = { - drmFix = true; - disableWebgl = false; - #startPageURL = "file://${builtins.readFile ./startpage.html}"; - }; - - extensions = { - simplefox.enable = true; - darkreader.enable = true; - - extraExtensions = { - "webextension@metamask.io".install_url = "https://addons.mozilla.org/firefox/downloads/latest/ether-metamask/latest.xpi"; - }; - }; - - misc.bookmarks = [ - #{ - # Title = "Example"; - # URL = "https://example.com"; - # Favicon = "https://example.com/favicon.ico"; - # Placement = "toolbar"; - # Folder = "FolderName"; - #} - ]; -}; -} diff --git a/hosts/vali/configuration.nix b/hosts/vali/configuration.nix index 2076d32..1031f8b 100644 --- a/hosts/vali/configuration.nix +++ b/hosts/vali/configuration.nix @@ -21,6 +21,7 @@ btop.enable = true; mpv.enable = true; i3.enable = true; + schizofox.enable = true; #neovim.enable = true; #git = { # enable = true; diff --git a/hosts/vali/programs.nix b/hosts/vali/programs.nix index c56660f..7472bad 100644 --- a/hosts/vali/programs.nix +++ b/hosts/vali/programs.nix @@ -21,6 +21,7 @@ in { qbittorrent ventoy-full lazygit + neofetch zip unzip gcc diff --git a/modules/cli/zsh.nix b/modules/cli/zsh.nix index abb3806..40d7907 100644 --- a/modules/cli/zsh.nix +++ b/modules/cli/zsh.nix @@ -25,16 +25,22 @@ in { pathsToLink = [ "/share/zsh" ]; }; home-manager.users.${username} = { + home.packages = with pkgs; [ nix-output-monitor ]; + programs.zoxide.enable = true; + programs.zoxide.enableZshIntegration = true; programs.zsh = { enable = true; shellAliases = { c = "clear"; - cc = "cd && clear"; + cc = "cd ~ && clear"; mv = "mv -iv"; rm = "trash -v"; l = "eza -a --icons"; la = "eza -lha --icons --git"; - cd = "zoxide"; + cd = "z"; + #TODO fix hardcoding of git repo path and profile name + update = "nixos-rebuild switch --flake \"$HOME/Git/nichts#${username}\" --log-format internal-json |& nom --json"; + } // cfg.extraAliases; initExtraFirst = mkIf cfg.profiling "zmodload zsh/zprof"; initExtra = mkIf cfg.profiling "zprof"; diff --git a/modules/terminal/st.nix b/modules/terminal/st.nix deleted file mode 100644 index e69de29..0000000 diff --git a/modules/terminal/starship.nix b/modules/terminal/starship.nix deleted file mode 100644 index e69de29..0000000 diff --git a/modules/terminal/zsh.nix b/modules/terminal/zsh.nix deleted file mode 100644 index e69de29..0000000