Merge remote-tracking branch 'origin/julia'

flake.nix

@@ -145,6 +145,16 @@
         system = "aarch64-darwin";
       };
 
+      # julia's cattop
+      nixosConfigurations.cattop = mkSystem "cattop" {
+        user = "julia";
+        host = "cattop";
+        system = "x86_64-linux";
+        extraModules = [
+          nixos-cosmic.nixosModules.default
+        ];
+      };
+
       # generate checks for "nix flake check --all-systems --no-build"
       checks.aarch64-darwin = builtins.listToAttrs (
         builtins.map (

modules/nixos/default.nix

@@ -7,7 +7,6 @@
   imports = [
     ./boot.nix
     ./ld.nix
-    ./nvidia.nix
     ./services.nix
   ];
   # make 'shared.darwin' not an error to define.

users/julia/cattop/configuration.nix

@@ -0,0 +1,127 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # networking.hostName = "nixos"; # Define your hostname.
+  # Pick only one of the below networking options.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+
+  # Set your time zone.
+  # time.timeZone = "Europe/Amsterdam";
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Select internationalisation properties.
+  # i18n.defaultLocale = "en_US.UTF-8";
+  # console = {
+  #   font = "Lat2-Terminus16";
+  #   keyMap = "us";
+  #   useXkbConfig = true; # use xkb.options in tty.
+  # };
+
+  # 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;
+  
+
+  # Configure keymap in X11
+  # services.xserver.xkb.layout = "us";
+  # services.xserver.xkb.options = "eurosign:e,caps:escape";
+
+  # Enable CUPS to print documents.
+  # services.printing.enable = true;
+
+  # Enable sound.
+  # services.pulseaudio.enable = true;
+  # OR
+  # services.pipewire = {
+  #   enable = true;
+  #   pulse.enable = true;
+  # };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.fish = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    packages = with pkgs; [
+      tree
+      git
+      nh
+      vim
+      fish
+    ];
+  };
+
+  programs.firefox.enable = true;
+
+  # List packages installed in system profile.
+  # You can use https://search.nixos.org/ to find more packages (and options).
+  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
+  ];
+
+  # 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;
+  };
+
+  # 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;
+
+  # Copy the NixOS configuration file and link it from the resulting system
+  # (/run/current-system/configuration.nix). This is useful in case you
+  # accidentally delete configuration.nix.
+  # system.copySystemConfiguration = true;
+
+  # This option defines the first version of NixOS you have installed on this particular machine,
+  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
+  #
+  # Most users should NEVER change this value after the initial install, for any reason,
+  # even if you've upgraded your system to a new NixOS release.
+  #
+  # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
+  # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
+  # to actually do that.
+  #
+  # This value being lower than the current NixOS release does NOT mean your system is
+  # out of date, out of support, or vulnerable.
+  #
+  # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
+  # and migrated your data accordingly.
+  #
+  # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
+  system.stateVersion = "25.05"; # Did you read the comment?
+}
+

users/julia/cattop/hardware-configuration.nix

@@ -0,0 +1,40 @@
+# 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" "thunderbolt" "vmd" "nvme" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/8eb0d6a2-b8cf-4ef2-ba2a-e25a5555b0bc";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/3B51-4A1C";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/58ee9d19-292f-49b5-9979-341b42e8e09d"; }
+    ];
+
+  # 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.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

users/julia/cattop/home.nix

@@ -0,0 +1,77 @@
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  userSettings,
+  systemSettings,
+  ...
+}:
+
+{
+  home = {
+    stateVersion = "23.05"; # Don't change this unless upgrading Home Manager versions
+
+    packages = with pkgs; [
+      # General applications
+      ghostty
+      stremio
+      julia
+      qbittorrent
+      calibre
+      mpv
+      signal-desktop
+      python3
+      gh
+
+      # Gaming
+      bottles
+      lutris
+      mangohud
+      dxvk_2
+      steam-run
+      vulkan-tools
+      path-of-building
+      wineWowPackages.stable
+      winetricks
+      (prismlauncher.override { gamemodeSupport = true; })
+
+      # System & desktop tools
+      wofi
+      xorg.xauth
+      kdePackages.dolphin
+      xdg-desktop-portal-gtk
+      xclip
+      pavucontrol
+      ethtool
+      grub2
+      efibootmgr
+      distrobox
+
+      # Dev tools
+      legcord
+      hyfetch
+      arduino-cli
+      rust-bin.stable.latest.default
+      tytools
+      inputs.zls.packages.x86_64-linux.zls
+      platformio
+      usbutils
+      teensy-loader-cli
+      teensyduino
+    ];
+  };
+
+  programs = {
+    btop.enable = true;
+    hyfetch.enable = true;
+
+    gh = {
+      enable = true;
+      gitCredentialHelper.enable = true;
+    };
+
+    # Uncomment if you want to use MangoHud system-wide
+    # mangohud.enable = true;
+  };
+}

users/julia/cattop/home.nix.old

@@ -0,0 +1,72 @@
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  userSettings,
+  systemSettings,
+  ...
+}:
+{
+  home = {
+    stateVersion = "23.05"; # Please read the comment before changing.
+
+    packages = with pkgs; [
+      #building macos apps hard :(
+      ghostty
+      stremio
+      julia
+      qbittorrent
+
+      #gaming
+      bottles
+      lutris
+      mangohud
+      dxvk_2
+      steam-run
+      vulkan-tools
+      path-of-building
+      wineWowPackages.stable
+      winetricks
+      (prismlauncher.override { gamemodeSupport = true; })
+
+      #window manager stuff
+      wofi
+      xorg.xauth
+      #linux tools
+      legcord
+      pavucontrol
+      ethtool
+      grub2
+      efibootmgr
+      distrobox
+      xdg-desktop-portal-gtk
+      xclip
+      kdePackages.dolphin
+      hyfetch
+      arduino-cli
+      python3
+      gh
+      #broken on macos
+      calibre
+      mpv
+      wireguard-tools
+      signal-desktop
+      inputs.zls.packages.x86_64-linux.zls
+      rust-bin.stable.latest.default
+    ];
+
+    # programs.mangohud.enable = true;
+    programs = {
+      btop.enable = true;
+      hyfetch.enable = true;
+      programs.gh = {
+        enable = true;
+        gitCredentialHelper = {
+          enable = true;
+        };
+      };
+    };
+
+  };
+}

users/julia/configuration.nix

@@ -0,0 +1,9 @@
+# Applied to all systems
+{
+  inputs,
+  pkgs,
+  host,
+  ...
+}:
+{
+}

users/julia/user.nix

@@ -0,0 +1,13 @@
+rec {
+  username = "fish"; # username
+  name = "Julia"; # name/identifier
+  email = "fish@fishcat.fish"; # email (used for certain configurations)
+  dotfilesDir = "~/config"; # absolute path of the local repo
+  theme = "catppuccin-mocha"; # name of theme that stylix will use
+  browser = "firefox"; # Default browser; must select one from ./user/app/browser/
+  term = "ghostty"; # Default terminal command;
+  font = "iosevka"; # Selected font
+  editor = "neovim"; # Default editor;
+  timeZone = "America/Los_Angeles";
+  sexuality = "transgender";
+}

users/julia/vim.nix

@@ -0,0 +1,21 @@
+{ ... }:
+{
+  vim.languages.astro.enable = true;
+  vim.theme.extraConfig = ''
+    if vim.g.neovide then
+      vim.g.neovide_cursor_trail_size = 0.3
+      vim.g.neovide_scroll_animation_length = 0.1;
+
+      vim.keymap.set('n', '<D-s>', ':w<CR>') -- Save
+      vim.keymap.set('v', '<D-c>', '"+y') -- Copy
+      vim.keymap.set('n', '<D-v>', '"+P') -- Paste normal mode
+      vim.keymap.set('v', '<D-v>', '"+P') -- Paste visual mode
+      vim.keymap.set('c', '<D-v>', '<C-R>+') -- Paste command mode
+      vim.keymap.set('i', '<D-v>', '<ESC>l"+Pli') -- Paste insert mode
+    end
+    vim.api.nvim_set_keymap("", '<D-v>', '+p<CR>', { noremap = true, silent = true})
+    vim.api.nvim_set_keymap('!', '<D-v>', '<C-R>+', { noremap = true, silent = true})
+    vim.api.nvim_set_keymap('t', '<D-v>', '<C-R>+', { noremap = true, silent = true})
+    vim.api.nvim_set_keymap('v', '<D-v>', '<C-R>+', { noremap = true, silent = true})
+  '';
+}