diff --git a/assets/jiji.jpg b/assets/jiji.jpg new file mode 100755 index 0000000..12bda15 Binary files /dev/null and b/assets/jiji.jpg differ diff --git a/flakes/home-manager.nix b/flakes/home-manager.nix index 797cac2..bafc225 100644 --- a/flakes/home-manager.nix +++ b/flakes/home-manager.nix @@ -7,6 +7,5 @@ inputs.home-manager.packages.${system}.default ]; - users.users.grey.isNormalUser = true; home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; } diff --git a/flakes/plasma-desktop-modified.nix b/flakes/plasma-desktop-modified.nix deleted file mode 100644 index e24f98a..0000000 --- a/flakes/plasma-desktop-modified.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - pkgs, - ... -}: { - services.desktopManager.plasma6 = { - enable = true; - enableQt5Integration = true; - }; - - environment.plasma6.excludePackages = with pkgs.kdePackages; [ - konsole - qrca - ]; - - services.displayManager.defaultSession = "plasma"; - - services.displayManager.sddm = { - enable = true; - theme = "breeze"; - wayland.enable = true; - enableHidpi = true; - settings = { - Autologin = { - Session = "plasma.desktop"; - User = "grey"; - }; - }; - }; -} diff --git a/flakes/plasma-desktop.nix b/flakes/plasma-desktop.nix index 7548332..e24f98a 100644 --- a/flakes/plasma-desktop.nix +++ b/flakes/plasma-desktop.nix @@ -8,10 +8,13 @@ enableQt5Integration = true; }; - environment.plasma6.excludePackages = with pkgs; [ - # kdepackages. + environment.plasma6.excludePackages = with pkgs.kdePackages; [ + konsole + qrca ]; + services.displayManager.defaultSession = "plasma"; + services.displayManager.sddm = { enable = true; theme = "breeze"; diff --git a/hosts/nixos-vm/default.nix b/hosts/nixos-vm/default.nix index f417791..b72f2e9 100644 --- a/hosts/nixos-vm/default.nix +++ b/hosts/nixos-vm/default.nix @@ -10,7 +10,7 @@ imports = [ ./hardware-configuration.nix ../../flakes/nh.nix - ../../flakes/plasma-desktop-modified.nix + ../../flakes/plasma-desktop.nix ../../flakes/home-manager.nix ../../flakes/zen-browser.nix ]; @@ -20,8 +20,6 @@ "flakes" ]; - virtualisation.virtualbox.guest.enable = true; - # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -71,6 +69,9 @@ packages = with pkgs; []; }; + virtualisation.virtualbox.guest.enable = true; + virtualisation.virtualbox.guest.dragAndDrop = true; + # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -81,6 +82,10 @@ pkgs.git ]; + programs.zsh.enable = true; + users.defaultUserShell = pkgs.zsh; + users.users."grey".shell = pkgs.zsh; + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/hosts/nixos-vm/fastfetch.nix b/hosts/nixos-vm/fastfetch.nix new file mode 100644 index 0000000..b32f0c8 --- /dev/null +++ b/hosts/nixos-vm/fastfetch.nix @@ -0,0 +1,122 @@ +{ + pkgs, + ... +}: { + programs.fastfetch = { + enable = true; + settings = { + logo = { + source = "/home/grey/nixos/assets/jiji.jpg"; + width = 25; + padding = { + top = 1; + left = 2; + right = 2; + }; + }; + + modules = [ + { + type = "separator"; + string = " "; + times = 0; + } + { + type = "title"; + color = { + user = "green"; + host = "green"; + }; + } + { + type = "separator"; + string = "-"; + times = 0; + } + { + type = "os"; + } + { + type = "kernel"; + } + { + type = "uptime"; + } + { + type = "shell"; + } + { + type = "de"; + } + { + type = "terminal"; + } + { + type = "cpu"; + temp = false; + showPeCoreCount = false; + } + { + type = "gpu"; + driverSpecific = false; + detectionMethod = "pci"; + temp = false; + hideType = "integrated"; + percent = { + green = 50; + yellow = 80; + type = 0; + }; + } + { + type = "memory"; + percent = { + green = 50; + yellow = 80; + type = 0; + }; + } + { + type = "swap"; + percent = { + green = 50; + yellow = 80; + type = 0; + }; + separate = false; + } + { + type = "disk"; + showRegular = true; + showExternal = false; + showHidden = false; + showSubvolumes = false; + showReadOnly = true; + ShowUnknown = false; + hideFolders = "/efi:/boot:/boot/*:/run/media/*"; + useAvailable = false; + percent = { + green = 50; + yellow = 80; + type = 0; + }; + } + { + type = "localip"; + showIpv4 = true; + showIpv6 = false; + showMac = false; + showLoop = false; + showPrefixLen = true; + showMtu = false; + showSpeed = false; + showFlags = false; + compact = false; + defaultRouteOnly = true; + showAllIps = false; + namePrefix = ""; + } + ]; + }; + }; +} diff --git a/hosts/nixos-vm/home.nix b/hosts/nixos-vm/home.nix index 986aee8..e598f70 100644 --- a/hosts/nixos-vm/home.nix +++ b/hosts/nixos-vm/home.nix @@ -1,15 +1,19 @@ { config, pkgs, + lib, ... }: { + imports = [ + ./fastfetch.nix + ]; + home.username = "grey"; home.homeDirectory = "/home/grey"; home.stateVersion = "26.05"; home.packages = [ - pkgs.kitty pkgs.bibata-cursors pkgs.papirus-icon-theme pkgs.steam @@ -55,6 +59,9 @@ }; programs.plasma = { + home.shell.enableZshIntegration = true; + + programs.zsh = { enable = true; overrideConfig = true; @@ -63,18 +70,41 @@ lookAndFeel = "org.kde.breezedark.desktop"; cursor.theme = "Bibata-Modern-Ice"; iconTheme = "Papirus-Dark"; + antidote = { + enable = true; + plugins = [ + "getantidote/use-omz" + "ohmyzsh/ohmyzsh path:lib" + "ohmyzsh/ohmyzsh path:plugins/pip" + "ohmyzsh/ohmyzsh path:plugins/command-not-found" + "ohmyzsh/ohmyzsh path:themes/nanotech.zsh-theme" + "zsh-users/zsh-autosuggestions" + "zsh-users/zsh-syntax-highlighting" + ]; }; shortcuts = { plasmashell = { "Show Activity Switcher" = ""; }; + localVariables = { + PATH = "/home/grey/.local/bin:$PATH"; + }; kwin = { "Close Window" = "Meta+Q"; }; + initContent = lib.mkOrder 1500 "fastfetch"; + }; "services/kitty.desktop"."_launch" = "Meta+Return"; + programs.kitty = { + enable = true; + settings = { + confirm_os_window_close = -1; }; + + shellIntegration.enableZshIntegration = true; + themeFile = "Arthur"; }; }