updating config

This commit is contained in:
Chris Cochrun 2022-06-17 09:46:23 -05:00
parent 264e4295aa
commit 270b92d0c2
8 changed files with 339 additions and 46 deletions

View file

@ -29,18 +29,53 @@ Both include the home-manager module. Primarily I chose that route so that I cou
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
url = "github:vaxerski/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { nixpkgs, home-manager, ... }:
outputs = { nixpkgs, home-manager, hyprland, ... }:
let
system = "x86_64-linux";
username = "chris";
localOverlay = final: prev: {
myAwesome = final.awesome.overrideAttrs (old: rec {
pname = "myAwesome";
version = "git-20220508-c539e0e";
src = prev.fetchFromGitHub {
owner = "awesomeWM";
repo = "awesome";
rev = "c539e0e4350a42f813952fc28dd8490f42d934b3";
sha256 = "EDAL7NnLF2BiVI8DAlEciiZtDmwXOzCPypGTrlN/OoQ=";
};
});
qt5ct = final.qt5ct.overrideAttrs (old: rec {
patches = (old.patches or []) ++ [
../../qt5ct.patch
];
});
emacsPgtkNativeComp = final.emacsPgtkNativeComp.overrideAttrs (old: rec {
pname = "emacs";
src = prev.fetchFromTarball {
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
sha256 = "09rsqmz7i7lyays59b9600z11qqr6h6lcskw1zzp54yw2csxn2ix";
};
});
};
pkgs = import nixpkgs {
inherit system;
config = { allowUnfree = true; };
# overlays = [
# hyprland.overlay
# localOverlay
# ];
};
lib = nixpkgs.lib;
@ -49,14 +84,17 @@ Both include the home-manager module. Primarily I chose that route so that I cou
nixosConfigurations = {
syl = lib.nixosSystem {
inherit system;
# inherit pkgs;
modules = [
./system/syl/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.chris = import ./user/home.nix;
}
hyprland.nixosModules.default
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.chris = import ./user/home.nix;
programs.hyprland.enable = true;
}
];
};
kaladin = lib.nixosSystem {
@ -64,11 +102,11 @@ Both include the home-manager module. Primarily I chose that route so that I cou
modules = [
./system/kaladin/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.chris = import ./user/home.nix;
}
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.chris = import ./user/home.nix;
}
];
};
};
@ -105,7 +143,7 @@ services.xserver = {
enable = true;
windowManager.awesome = {
enable = true;
package = pkgs.myAwesome;
# package = pkgs.myAwesome;
};
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
@ -150,6 +188,42 @@ programs.fish.enable = true;
programs.zsh.enable = true;
#+end_src
#+NAME: samba
#+begin_src nix
services.samba-wsdd.enable = true;
services.samba = {
enable = true;
extraConfig = ''
workgroup = WORKGROUP
server string = smbnix
netbios name = smbnix
security = user
#use sendfile = yes
#max protocol = smb2
# note: localhost is the ipv6 localhost ::1
hosts allow = 192.168.0. 127.0.0.1 localhost
hosts deny = 0.0.0.0/0
guest account = nobody
map to guest = bad user
'';
shares = {
public = {
path = "/home/chris/Public";
"read only" = false;
browsable = true;
"guest ok" = true;
comment = "Share";
};
};
};
#+end_src
#+NAME: podman
#+begin_src nix
virtualisation.podman.enable = true;
virtualisation.docker.enable = true;
#+end_src
*** Packages
Here are a list of packages that I like to have on all machines.
#+NAME: general-packages
@ -187,6 +261,7 @@ libimobiledevice
sddm-kcm
ydotool
bottles
podman-compose
exa
imv
feh
@ -247,11 +322,15 @@ macchina
gimp
powertop
quickemu
OVMFFull
element-desktop-wayland
# hyprland
#+end_src
Here are some dev tools that I often have on a few devices.
#+NAME: dev-tools
#+begin_src nix
android-tools
nix-index
meson
ninja
@ -294,11 +373,11 @@ For some reason the emacs overlay has a specific sha256. So I'll create it in ea
{
myAwesome = super.awesome.overrideAttrs (old: rec {
pname = "myAwesome";
version = "git-20220508-c539e0e";
version = "git-20220614-3a54221";
src = super.fetchFromGitHub {
owner = "awesomeWM";
repo = "awesome";
rev = "c539e0e4350a42f813952fc28dd8490f42d934b3";
rev = "3a542219f3bf129546ae79eb20e384ea28fa9798";
sha256 = "EDAL7NnLF2BiVI8DAlEciiZtDmwXOzCPypGTrlN/OoQ=";
};
});
@ -359,6 +438,8 @@ Notice how I am including all of my software here. It may be a big file, but hav
networking.useDHCP = false;
networking.interfaces.wlp170s0.useDHCP = true;
<<podman>>
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
@ -471,6 +552,7 @@ Notice how I am including all of my software here. It may be a big file, but hav
];
<<emacs>>
<<samba>>
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
@ -680,6 +762,7 @@ Kaladin is my desktop machine. A powerhouse for the most part with a recent i7 a
];
<<emacs>>
<<samba>>
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.