Added more goodies, stable. WIP unfree

This commit is contained in:
Nathan Anderson 2023-12-14 21:58:29 -07:00
parent 917ae5f05e
commit 0896ee2fe2
7 changed files with 61 additions and 11 deletions

3
.ignore Normal file
View File

@ -0,0 +1,3 @@
dotfiles/
.git/
flake.lock

View File

@ -19,6 +19,11 @@ input * {
# xkb_options "ctrl:nocaps" # xkb_options "ctrl:nocaps"
} }
input type:keyboard {
repeat_rate 40
repeat_delay 175
}
exec_always { exec_always {
'swaymsg input type:keyboard xkb_layout "$(localectl status | grep "X11 Layout" | sed -e "s/^.*X11 Layout://")"' '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://")"' 'swaymsg input type:keyboard xkb_variant "$(localectl status | grep "X11 Variant" | sed -e "s/^.*X11 Variant://")"'

View File

@ -36,10 +36,27 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable"
} }
} }
}, },

View File

@ -4,18 +4,28 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = inputs@{ self, nixpkgs, home-manager, ... }: outputs = inputs@{ self, nixpkgs, nixpkgs-stable, home-manager, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
userName = "nate"; userName = "nate";
hostName = "winmax"; 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 in
{ {
nixosConfigurations = { nixosConfigurations = {
@ -30,6 +40,7 @@
nixSway = nixpkgs.lib.nixosSystem { nixSway = nixpkgs.lib.nixosSystem {
# Pass args to sway_configuration # Pass args to sway_configuration
specialArgs = { specialArgs = {
inherit inputs;
inherit userName; inherit userName;
inherit hostName; inherit hostName;
}; };
@ -44,6 +55,7 @@
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
inherit inputs; inherit inputs;
inherit userName; inherit userName;
inherit stablePkgs;
inherit hostName; inherit hostName;
}; };
} }

View File

@ -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 # Home Manager needs a bit of information about you and the paths it should
@ -16,20 +16,22 @@
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
bat bat
corectrl # stablePkgs.corectrl
fd fd
firefox firefox
foot foot
fzf fzf
htop
kakoune kakoune
keepassxc keepassxc
mako mako
networkmanagerapplet networkmanagerapplet
xfce.thunar obs-studio
thunar signal-desktop
# steam
waybar waybar
wofi wofi
xfce.thunar
# Install fonts # Install fonts
(nerdfonts.override { fonts = [ "Hermit" ]; }) (nerdfonts.override { fonts = [ "Hermit" ]; })
overpass overpass
@ -87,14 +89,15 @@
# kdeconnect setup # kdeconnect setup
services.kdeconnect = { services.kdeconnect = {
enabled = true; enable = true;
indicator = true; indicator = true;
}; };
# Git setup # Git setup
programs.git = { programs.git = {
enabled = true; enable = true;
userEmail = "n8r@tuta.io";
userName = "Nate Anderson";
}; };
# Zsh setup # Zsh setup

View File

@ -40,6 +40,7 @@ in
extraGroups = [ extraGroups = [
"wheel" "wheel"
"networkmanager" "networkmanager"
"corectrl"
cfg.userName cfg.userName
"video" "video"
"audio" "audio"

View File

@ -76,6 +76,11 @@
# Setup xdg portal for screen share # Setup xdg portal for screen share
xdg.portal = { xdg.portal = {
extraPortals = with pkgs; [
xdg-desktop-portal-wlr
xdg-desktop-portal-kde
xdg-desktop-portal-gtk
];
wlr.enable = true; wlr.enable = true;
}; };
xdg.sounds.enable = true; xdg.sounds.enable = true;
@ -92,6 +97,10 @@
}; };
programs.zsh.enable = true; 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: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget