Added more goodies, stable. WIP unfree
This commit is contained in:
		
							parent
							
								
									917ae5f05e
								
							
						
					
					
						commit
						0896ee2fe2
					
				@ -19,6 +19,11 @@ input * {
 | 
			
		||||
    # xkb_options "ctrl:nocaps"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
input type:keyboard {
 | 
			
		||||
   repeat_rate 40
 | 
			
		||||
   repeat_delay 175 
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
exec_always {
 | 
			
		||||
    'swaymsg input type:keyboard xkb_layout "$(localectl status | grep "X11 Layout" | sed -e "s/^.*X11 Layout://")"'
 | 
			
		||||
    'swaymsg input type:keyboard xkb_variant "$(localectl status | grep "X11 Variant" | sed -e "s/^.*X11 Variant://")"'
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										19
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										19
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@ -36,10 +36,27 @@
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "nixpkgs-stable": {
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1702346276,
 | 
			
		||||
        "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
        "owner": "nixos",
 | 
			
		||||
        "ref": "nixos-23.11",
 | 
			
		||||
        "repo": "nixpkgs",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "root": {
 | 
			
		||||
      "inputs": {
 | 
			
		||||
        "home-manager": "home-manager",
 | 
			
		||||
        "nixpkgs": "nixpkgs"
 | 
			
		||||
        "nixpkgs": "nixpkgs",
 | 
			
		||||
        "nixpkgs-stable": "nixpkgs-stable"
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										16
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								flake.nix
									
									
									
									
									
								
							@ -4,18 +4,28 @@
 | 
			
		||||
  inputs = {
 | 
			
		||||
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 | 
			
		||||
 | 
			
		||||
    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
 | 
			
		||||
 | 
			
		||||
    home-manager = {
 | 
			
		||||
        url = "github:nix-community/home-manager";
 | 
			
		||||
        inputs.nixpkgs.follows = "nixpkgs";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  outputs = inputs@{ self, nixpkgs, home-manager, ... }:
 | 
			
		||||
  outputs = inputs@{ self, nixpkgs, nixpkgs-stable, home-manager, ... }:
 | 
			
		||||
  let
 | 
			
		||||
    system = "x86_64-linux";
 | 
			
		||||
    userName = "nate";
 | 
			
		||||
    hostName = "winmax";
 | 
			
		||||
    pkgs = nixpkgs.legacyPackages.${system};
 | 
			
		||||
    pkgs = import nixpkgs {
 | 
			
		||||
        legacyPackages = system;
 | 
			
		||||
        # smh steam
 | 
			
		||||
        config.allowUnfree = true;
 | 
			
		||||
    };
 | 
			
		||||
    stablePkgs = import nixpkgs-stable {
 | 
			
		||||
        legacyPackages = system;
 | 
			
		||||
        config.allowUnfree = true;
 | 
			
		||||
    };
 | 
			
		||||
  in
 | 
			
		||||
  {
 | 
			
		||||
    nixosConfigurations = {
 | 
			
		||||
@ -30,6 +40,7 @@
 | 
			
		||||
      nixSway = nixpkgs.lib.nixosSystem {
 | 
			
		||||
        # Pass args to sway_configuration
 | 
			
		||||
        specialArgs = {
 | 
			
		||||
            inherit inputs;
 | 
			
		||||
            inherit userName;
 | 
			
		||||
            inherit hostName;
 | 
			
		||||
        };
 | 
			
		||||
@ -44,6 +55,7 @@
 | 
			
		||||
              home-manager.extraSpecialArgs = {
 | 
			
		||||
                  inherit inputs;
 | 
			
		||||
                  inherit userName;
 | 
			
		||||
                  inherit stablePkgs;
 | 
			
		||||
                  inherit hostName;
 | 
			
		||||
              };
 | 
			
		||||
          }
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,4 @@
 | 
			
		||||
{ config, pkgs, userName, hostName, ... }:
 | 
			
		||||
{ config, pkgs, inputs, stablePkgs, userName, hostName, ... }:
 | 
			
		||||
 | 
			
		||||
{
 | 
			
		||||
  # Home Manager needs a bit of information about you and the paths it should
 | 
			
		||||
@ -16,20 +16,22 @@
 | 
			
		||||
  fonts.fontconfig.enable = true;
 | 
			
		||||
  home.packages = with pkgs; [
 | 
			
		||||
    bat
 | 
			
		||||
    corectrl
 | 
			
		||||
    # stablePkgs.corectrl
 | 
			
		||||
    fd
 | 
			
		||||
    firefox
 | 
			
		||||
    foot
 | 
			
		||||
    fzf
 | 
			
		||||
    htop
 | 
			
		||||
    kakoune
 | 
			
		||||
    keepassxc
 | 
			
		||||
    mako
 | 
			
		||||
    networkmanagerapplet
 | 
			
		||||
    xfce.thunar
 | 
			
		||||
    thunar
 | 
			
		||||
    obs-studio
 | 
			
		||||
    signal-desktop
 | 
			
		||||
    # steam
 | 
			
		||||
    waybar
 | 
			
		||||
    wofi
 | 
			
		||||
 | 
			
		||||
    xfce.thunar
 | 
			
		||||
    # Install fonts
 | 
			
		||||
    (nerdfonts.override { fonts = [ "Hermit" ]; })
 | 
			
		||||
    overpass
 | 
			
		||||
@ -87,14 +89,15 @@
 | 
			
		||||
 | 
			
		||||
  # kdeconnect setup
 | 
			
		||||
  services.kdeconnect = {
 | 
			
		||||
      enabled = true;
 | 
			
		||||
      enable = true;
 | 
			
		||||
      indicator = true;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  # Git setup
 | 
			
		||||
  programs.git = {
 | 
			
		||||
      enabled = true;
 | 
			
		||||
      
 | 
			
		||||
      enable = true;
 | 
			
		||||
      userEmail = "n8r@tuta.io";
 | 
			
		||||
      userName = "Nate Anderson";
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  # Zsh setup
 | 
			
		||||
 | 
			
		||||
@ -40,6 +40,7 @@ in
 | 
			
		||||
                extraGroups = [
 | 
			
		||||
                    "wheel"
 | 
			
		||||
                    "networkmanager"
 | 
			
		||||
                    "corectrl"
 | 
			
		||||
                    cfg.userName
 | 
			
		||||
                    "video"
 | 
			
		||||
                    "audio"
 | 
			
		||||
 | 
			
		||||
@ -76,6 +76,11 @@
 | 
			
		||||
 | 
			
		||||
  # Setup xdg portal for screen share
 | 
			
		||||
  xdg.portal = {
 | 
			
		||||
      extraPortals = with pkgs; [
 | 
			
		||||
          xdg-desktop-portal-wlr
 | 
			
		||||
          xdg-desktop-portal-kde
 | 
			
		||||
          xdg-desktop-portal-gtk
 | 
			
		||||
      ];
 | 
			
		||||
      wlr.enable = true;
 | 
			
		||||
  };
 | 
			
		||||
  xdg.sounds.enable = true;
 | 
			
		||||
@ -92,6 +97,10 @@
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  programs.zsh.enable = true;
 | 
			
		||||
  # Corectrl from stable branch
 | 
			
		||||
  # inputs.nixpkgs-stable.lib.nixosSystem.programs.corectrl.enable = true;
 | 
			
		||||
 | 
			
		||||
  # programs.corectrl.enable = true;
 | 
			
		||||
 | 
			
		||||
  # List packages installed in system profile. To search, run:
 | 
			
		||||
  # $ nix search wget
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user