diff --git a/cachix/garnix.nix b/cachix/garnix.nix deleted file mode 100644 index b0f11d5..0000000 --- a/cachix/garnix.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - nix = { - settings = { - substituters = [ - "https://cache.garnix.io" - ]; - trusted-public-keys = [ - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - ]; - }; - }; -} diff --git a/cachix/hyprland.nix b/cachix/hyprland.nix deleted file mode 100644 index 449c36b..0000000 --- a/cachix/hyprland.nix +++ /dev/null @@ -1,13 +0,0 @@ - -{ - nix = { - settings = { - substituters = [ - "https://hyprland.cachix.org" - ]; - trusted-public-keys = [ - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - ]; - }; - }; -} diff --git a/flake.nix b/flake.nix index adaa635..11d2e1d 100644 --- a/flake.nix +++ b/flake.nix @@ -72,39 +72,6 @@ in { nixosConfigurations = { - "durincore" = nixpkgs-unstable.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - # Import the configuration.nix here, so that the - # old configuration file can still take effect. - # Note: configuration.nix itself is also a Nixpkgs Module, - ./nixos/durincore/configuration.nix - ./nixos/common.nix - # { nixpkgs.overlays = [ (self: super: { atuin = atuin.packages.${self.pkgs.system}.atuin; }) ]; } - home-manager-unstable.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.jahanson = import ./home-manager/durincore.nix; - home-manager.extraSpecialArgs = {inherit inputs outputs;}; - } - ]; - }; - "este" = nixpkgs-stable.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs outputs;}; - modules = [ - ./nixos/este/configuration.nix - ./nixos/common.nix - home-manager-stable.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.jahanson = import ./home-manager/este.nix; - } - ]; - }; "gandalf" = nixpkgs-stable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; diff --git a/garnix.yaml b/garnix.yaml deleted file mode 100644 index aab5500..0000000 --- a/garnix.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Config for garnix.io builds & caching -builds: - include: - - homeConfigurations.* - - nixosConfigurations.* - - packages.x86_64-linux.* - - packages.aarch64-linux.* diff --git a/home-manager/durincore.nix b/home-manager/durincore.nix deleted file mode 100644 index d26a26a..0000000 --- a/home-manager/durincore.nix +++ /dev/null @@ -1,319 +0,0 @@ -{ pkgs, inputs, ... }: - -{ - imports = [ inputs.hyprland-git.homeManagerModules.default ]; - - wayland.windowManager.hyprland = { - enable = true; - systemd.enable = true; - plugins = [ inputs.hy3.packages.${pkgs.system}.hy3 ]; - settings = { - "monitor" = "eDP-1,1920x1080@60,0x0,1"; - "$mainMod" = "SUPER"; - "$terminal" = "alacritty"; - "$fileManager" = "thunar"; - "$menu" = "wofi --show drun"; - bind = - [ - # Disables middle mouse button paste. - ", mouse:274, exec, ;" - # See https://wiki.hyprland.org/Configuring/Keywords/ for more - - # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more - "$mainMod, Q, exec, $terminal" - "$mainMod, C, killactive," - "$mainMod, M, exit," - "$mainMod, E, exec, $fileManager" - "$mainMod, V, togglefloating," - "$mainMod, R, exec, $menu" - "$mainMod, P, pseudo, # dwindle" - "$mainMod, J, togglesplit, # dwindle" - - # Move focus with mainMod + arrow keys - "$mainMod, left, movefocus, l" - "$mainMod, right, movefocus, r" - "$mainMod, up, movefocus, u" - "$mainMod, down, movefocus, d" - - # Switch workspaces with mainMod + [0-9] - "$mainMod, 1, workspace, 1" - "$mainMod, 2, workspace, 2" - "$mainMod, 3, workspace, 3" - "$mainMod, 4, workspace, 4" - "$mainMod, 5, workspace, 5" - "$mainMod, 6, workspace, 6" - "$mainMod, 7, workspace, 7" - "$mainMod, 8, workspace, 8" - "$mainMod, 9, workspace, 9" - "$mainMod, 0, workspace, 10" - - # Move active window to a workspace with mainMod + SHIFT + [0-9] - "$mainMod SHIFT, 1, movetoworkspace, 1" - "$mainMod SHIFT, 2, movetoworkspace, 2" - "$mainMod SHIFT, 3, movetoworkspace, 3" - "$mainMod SHIFT, 4, movetoworkspace, 4" - "$mainMod SHIFT, 5, movetoworkspace, 5" - "$mainMod SHIFT, 6, movetoworkspace, 6" - "$mainMod SHIFT, 7, movetoworkspace, 7" - "$mainMod SHIFT, 8, movetoworkspace, 8" - "$mainMod SHIFT, 9, movetoworkspace, 9" - "$mainMod SHIFT, 0, movetoworkspace, 10" - - # Example special workspace (scratchpad) - "$mainMod, S, togglespecialworkspace, magic" - "$mainMod SHIFT, S, movetoworkspace, special:magic" - - # Scroll through existing workspaces with mainMod + scroll - "$mainMod, mouse_down, workspace, e+1" - "$mainMod, mouse_up, workspace, e-1" - ]; - general = { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - gaps_in = 5; - gaps_out = 20; - border_size = 2; - "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; - "col.inactive_border" = "rgba(595959aa)"; - - layout = "dwindle"; - }; - - decoration = { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - rounding = 10; - - blur = { - enabled = true; - size = 3; - passes = 1; - - vibrancy = "0.1696"; - }; - - drop_shadow = true; - shadow_range = 4; - shadow_render_power = 3; - "col.shadow" = "rgba(1a1a1aee)"; - }; - - animations = { - enabled = true; - - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = "myBezier, 0.05, 0.9, 0.1, 1.05"; - - animation = - [ - "windows, 1, 7, myBezier" - "windowsOut, 1, 7, default, popin 80%" - "border, 1, 10, default" - "borderangle, 1, 8, default" - "fade, 1, 7, default" - "workspaces, 1, 6, default" - ]; - }; - - dwindle = { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = true; # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = true; # you probably want this - }; - - master = { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true; - }; - - input = { - touchpad = { - natural_scroll = "true"; - }; - }; - windowrulev2 = "suppressevent maximize, class:.*"; # You'll probably like this. - exec-once = - [ - "waybar" - "dunst" - "1password --silent" - ]; - }; - }; - - # please change the username & home direcotry to your own - home.username = "jahanson"; - home.homeDirectory = "/home/jahanson"; - - # basic configuration of git, please change to your own - programs.git = { - enable = true; - userName = "Joseph Hanson"; - userEmail = "joe@veri.dev"; - extraConfig = { - user = { signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIDSAmssproxG+KsVn2DfuteBAemHrmmAFzCtldpKl4J"; }; - gpg = { format = "ssh"; }; - "gpg \"ssh\"" = { program = "/etc/profiles/per-user/jahanson/bin/op-ssh-sign"; }; - commit = { gpgsign = true; }; - }; - }; - - programs.fish = { - enable = true; - shellAliases = { - # lsd - ls = "lsd"; - ll = "lsd -l"; - la = "lsd -a"; - lt = "lsd --tree"; - lla = "lsd -la"; - - # other - df = "df -h"; - du = "du -h"; - - # nvd - nix visual diff - nvdiff = "nixos-rebuild build && nvd diff /run/current-system result"; - }; - - # rtx hook-env | source - # rtx activate fish | source - shellInit = '' - direnv hook fish | source - set -gx PATH $PATH $HOME/.krew/bin - ''; - interactiveShellInit = '' - atuin init fish | source - ''; - functions = { - fish_greeting = { - description = "Set the fish greeting"; - body = "fastfetch"; - }; - }; - }; - - # Packages that should be installed to the user profile. - home.packages = with pkgs; [ - # here is some command line tools I use frequently - # feel free to add your own or remove some of them - - # Hyprland must haves - xfce.thunar # gui file manager - wofi # Run Menu - waybar # Wayland bar for Sway and Wlroots based compositors - dunst # A lightweight replacement for the notification-daemons provided by most desktop environments - - # utils - kustomize - _1password-gui - _1password - - # kubernetes - k9s - kubectl - kubelogin-oidc # omni login for k8s - krew - fluxcd - kubernetes-helm - cilium-cli - hubble - lens - - # misc - fira-code-nerdfont - - # nix related - # - # it provides the command `nom` works just like `nix` - # with more details log output - nix-output-monitor - # nix - inputs.nixd-git.packages.${pkgs.system}.nixd # nix lsp server - - # productivity - glow # markdown previewer in terminal - - rtx # rtx package manager - - # Browsers - firefox - vivaldi - vivaldi-ffmpeg-codecs - - # Email - thunderbird - - # Dev - vscode - termius - - # Nix - nix-inspect - ]; - - # alacritty - a cross-platform, GPU-accelerated terminal emulator - programs.alacritty = { - enable = true; - # custom settings - settings = { - env.TERM = "xterm-256color"; - font = { - size = 12; - }; - scrolling.multiplier = 5; - selection.save_to_clipboard = true; - window.dimensions = { - columns = 120; - lines = 30; - }; - }; - }; - - gtk = { - enable = true; - - theme = { - name = "Dracula"; - package = pkgs.dracula-theme; - }; - - iconTheme = { - name = "Dracula"; - package = pkgs.dracula-icon-theme; - }; - - cursorTheme = { - name = "Numix-Cursor"; - package = pkgs.numix-cursor-theme; - }; - - gtk3.extraConfig = { - Settings = '' - gtk-application-prefer-dark-theme=1 - ''; - }; - - gtk4.extraConfig = { - Settings = '' - gtk-application-prefer-dark-theme=1 - ''; - }; - }; - - home.sessionVariables.GTK_THEME = "Dracula"; - - # This value determines the home Manager release that your - # configuration is compatible with. This helps avoid breakage - # when a new home Manager release introduces backwards - # incompatible changes. - # - # You can update home Manager without changing this value. See - # the home Manager release notes for a list of state version - # changes in each release. - home.stateVersion = "24.05"; - - # Let home Manager install and manage itself. - programs.home-manager.enable = true; -} diff --git a/home-manager/este.nix b/home-manager/este.nix deleted file mode 100644 index 08a646d..0000000 --- a/home-manager/este.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - pkgs, - ... -}: { - - home = { - username = "jahanson"; - homeDirectory = "/home/jahanson"; - }; - - # basic configuration of git, please change to your own - programs.git = { - enable = true; - userName = "Joseph Hanson"; - userEmail = "joe@veri.dev"; - }; - - # Fish configuration - programs.fish = { - enable = true; - shellAliases = { - # lsd - ls = "lsd"; - ll = "lsd -l"; - la = "lsd -a"; - lt = "lsd --tree"; - lla = "lsd -la"; - - # other - df = "df -h"; - du = "du -h"; - - # nvd - nix visual diff - nvdiff = "nixos-rebuild build $argv && nvd diff /run/current-system result"; - }; - # rtx hook-env | source - # rtx activate fish | source - shellInit = '' - direnv hook fish | source - set -gx PATH $PATH $HOME/.krew/bin - ''; - interactiveShellInit = '' - atuin init fish | source - ''; - functions = { - fish_greeting = { - description = "Set the fish greeting"; - body = "fastfetch"; - }; - }; - }; - - # Packages that should be installed to the user profile. - home.packages = with pkgs; [ - # here is some command line tools I use frequently - # feel free to add your own or remove some of them - - # nix related - # - # it provides the command `nom` works just like `nix` - # with more details log output - nix-output-monitor - - ]; - - home.stateVersion = "23.11"; - programs.home-manager.enable = true; -} diff --git a/nixos/durincore/configuration.nix b/nixos/durincore/configuration.nix deleted file mode 100644 index 50b81ab..0000000 --- a/nixos/durincore/configuration.nix +++ /dev/null @@ -1,139 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running 'nixos-help'). - -{ pkgs, inputs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Network settings - networking = { - hostName = "durincore"; # Define your hostname. - networkmanager.enable = true; - }; - - programs.hyprland = { - enable = true; - package = inputs.hyprland-git.packages.${pkgs.system}.hyprland; - portalPackage = inputs.hyprland-xdph-git.packages.${pkgs.system}.xdg-desktop-portal-hyprland; - }; - - # VirtManager for gandalf QEMU/KVM - programs.virt-manager.enable = true; - - environment.sessionVariables = { - NIXOS_OZONE_WL = "1"; - }; - - # # Enable the X11 windowing system. - # services.xserver.enable = true; - - # # Enable the GNOME Desktop Environment. - # services.xserver.displayManager.gdm.enable = true; - # services.xserver.desktopManager.gnome.enable = true; - - # services.gnome.gnome-keyring.enable = true; - # security.pam.services.jahanson.enableGnomeKeyring = true; - # programs.seahorse.enable = true; - - # # Configure keymap in X11 - # services.xserver = { - # layout = "us"; - # xkbVariant = ""; - # }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable login prompt when booting. - services.greetd = { - enable = true; - settings = { - default_session = { - command = "${pkgs.greetd.greetd}/bin/agreety --cmd Hyprland"; - }; - }; - }; - services.cachix-agent.enable = true; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.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; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It's perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? - - # Register app image as an executable and run it with appimage-run - boot.binfmt.registrations.appimage = { - wrapInterpreterInShell = false; - interpreter = "${pkgs.appimage-run}/bin/appimage-run"; - recognitionType = "magic"; - offset = 0; - mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; - magicOrExtension = ''\x7fELF....AI\x02''; - }; - - systemd.user.services.ssh_agent = { - enable = true; - description = "OpenSSH key agent"; - documentation = ["man:ssh-agent(1)" "man:ssh-add(1)" "man:ssh(1)"]; - unitConfig = { - ConditionEnvironment = "!SSH_AGENT_PID"; - }; - serviceConfig = { - ExecStart = "/run/current-system/sw/bin/ssh-agent -D -a $SSH_AUTH_SOCK"; - Environment = "SSH_AUTH_SOCK=%t/ssh-agent.socket"; - PassEnvironment = "SSH_AGENT_PID"; - SuccessExitStatus = "2"; - Type = "simple"; - }; - wantedBy = [ "default.target" ]; - }; - - # Enable the OpenSSH daemon. - services.openssh = { - enable = true; - settings.PasswordAuthentication = false; - settings.KbdInteractiveAuthentication = false; - }; -} diff --git a/nixos/durincore/hardware-configuration.nix b/nixos/durincore/hardware-configuration.nix deleted file mode 100644 index 35042fb..0000000 --- a/nixos/durincore/hardware-configuration.nix +++ /dev/null @@ -1,40 +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, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/08d03cf3-7fdc-4986-ab3a-b013a2de5c3b"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-eaf57b5b-66e6-419d-b23b-c8b2b6e2b08d".device = "/dev/disk/by-uuid/eaf57b5b-66e6-419d-b23b-c8b2b6e2b08d"; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5B54-234D"; - 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.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/este/configuration.nix b/nixos/este/configuration.nix deleted file mode 100644 index a58724a..0000000 --- a/nixos/este/configuration.nix +++ /dev/null @@ -1,50 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running 'nixos-help'). - -{ ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Network settings - networking = { - hostName = "este"; # Define your hostname. - networkmanager.enable = true; - }; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - # List services that you want to enable: - - services.cachix-agent.enable = true; - # Enable the OpenSSH daemon. - services.openssh = { - enable = true; - settings.PasswordAuthentication = false; - settings.KbdInteractiveAuthentication = false; - }; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - networking.firewall.enable = false; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It's perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? - -} diff --git a/nixos/este/hardware-configuration.nix b/nixos/este/hardware-configuration.nix deleted file mode 100644 index 739ae3a..0000000 --- a/nixos/este/hardware-configuration.nix +++ /dev/null @@ -1,34 +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 = [ ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "sr_mod" "xen_blkfront" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/1c14fc1e-525b-445b-ad2f-ac171c25633a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3D93-F935"; - 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.enX0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} \ No newline at end of file