chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hopefully updating things for laptop and dalinar

Browse source
This commit is contained in:
Chris Cochrun 2022-10-24 06:30:32 -05:00
parent 6b27a9a6ee
commit c25f1f4cf1
8 changed files with 116 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
LightlyShaders/default.nix
View file

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "LightlyShaders";
version = "0.1.5";
version = "2.0.0";
src = fetchFromGitHub {
owner = "a-parhom";
repo = "LightlyShaders";
rev = "04432c4a704d561541ae2be1f9907bb7bb783a2b";
sha256 = "c/zbYmOXhl0xX+Rjw5eU48jQqA+OAxsh/pvWXo5bakA=";
rev = "v2.0";
sha256 = "YG2sHvPSl3ckrKgZYp0w+RR+G/iE+weHLh1ZM9nDjRI=";
};
# dontWrapQtApps = true;

2
LightlyShaders/result
View file

@ -1 +1 @@
/nix/store/1fammczms41261rbb66pmrafpfqlsdjr-LightlyShaders-0.0.4
/nix/store/9imgsipfb5zky21hhg1b840dpmqq5sww-LightlyShaders-2.0.0

31
README.org
View file

@ -46,9 +46,12 @@ Both include the home-manager module. Primarily I chose that route so that I cou
nix-bitcoin = {
url = "github:fort-nix/nix-bitcoin/release";
};
libre-presenter = {
url = "gitlab:chriscochrun/church-presenter";
};
};
outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, emacs, nix-bitcoin, ... }:
outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, emacs, nix-bitcoin, libre-presenter, ... }:
let
system = "x86_64-linux";
username = "chris";
@ -98,6 +101,7 @@ Both include the home-manager module. Primarily I chose that route so that I cou
./system/syl/configuration.nix
home-manager.nixosModules.home-manager
hyprland.nixosModules.default
# libre-presenter.defaultPackage
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
@ -350,6 +354,7 @@ audacity
krename
kwallet-pam
plasma5Packages.kwallet
sierra-breeze-enhanced
libimobiledevice
sddm-kcm
ydotool
@ -364,7 +369,7 @@ mpv
nerdfonts
latte-dock
alacritty
libsForQt5.bismuth
# libsForQt5.bismuth
libnotify
rofi-wayland
waybar
@ -378,6 +383,7 @@ vulkan-tools
wayland-utils
# mkchromecast
plocate
# librepresenter.libre-presenter
papirus-icon-theme
phinger-cursors
plasma-hud
@ -474,7 +480,13 @@ fennel
Let's create our own custom LightlyShaders package. This is in it's own file for now.
#+NAME: lightlyshaders
#+begin_src nix
(libsForQt5.callPackage ../../LightlyShaders {})
(with import <nixpkgs> {}; libsForQt5.callPackage ../../LightlyShaders {})
#+end_src
Let's also add our own package from my WIP presenter
#+NAME: librepresenter
#+begin_src nix
(with import <nixpkgs> {}; libsForQt5.callPackage /home/chris/dev/church-presenter {})
#+end_src
Firefox has it's own setup
@ -684,6 +696,9 @@ Notice how I am including all of my software here. It may be a big file, but hav
# Dev tools
<<dev-tools>>
<<lightlyshaders>>
<<librepresenter>>
# (with import <nixpkgs> {}; libsForQt5.callPackage ../../bismuth {})
];
services.emacs = {
@ -1269,7 +1284,15 @@ Dalinar's config is of course server oriented.
};
};
systemd.servics = {
mail-cert-renew = {
enable = true;
serviceConfig = {
Type = "oneshot";
ExecStart = with pkgs.docker "sh -c /home/chris/bin/mail-cert-renew"
};
};
};
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];

69
flake.lock generated
View file

@ -51,6 +51,21 @@
"type": "github"
}
},
"flake-utils_3": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -94,10 +109,29 @@
"type": "github"
}
},
"nix-bitcoin": {
"libre-presenter": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1666382313,
"narHash": "sha256-UsHwkyT1tbrcmqVWcgusKpK8ovcQoZ+vKJSMHdR4KGQ=",
"owner": "chriscochrun",
"repo": "church-presenter",
"rev": "8da2a39a168ceb237dad3b2b74aed818c742076d",
"type": "gitlab"
},
"original": {
"owner": "chriscochrun",
"repo": "church-presenter",
"type": "gitlab"
}
},
"nix-bitcoin": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_2",
"nixpkgsUnstable": "nixpkgsUnstable"
},
"locked": {
@ -117,16 +151,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1663760840,
"narHash": "sha256-ym5Iycs5H4cOaLfE2/vC0tsLp8XuBJQIHGV8/uXSy8M=",
"owner": "NixOS",
"lastModified": 1666282307,
"narHash": "sha256-O1T2HGLARLKDLfdOmjPBfn3eC4cSIaQD71wUN4I/6/s=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9bdbbaa634aa666eb6a27096bdcb991c59181244",
"rev": "b7d8c687782c8f9a1d425a7e486eb989654f6468",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05",
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -164,6 +198,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1663760840,
"narHash": "sha256-ym5Iycs5H4cOaLfE2/vC0tsLp8XuBJQIHGV8/uXSy8M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9bdbbaa634aa666eb6a27096bdcb991c59181244",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1666282307,
"narHash": "sha256-O1T2HGLARLKDLfdOmjPBfn3eC4cSIaQD71wUN4I/6/s=",
@ -184,8 +234,9 @@
"emacs": "emacs",
"home-manager": "home-manager",
"hyprland": "hyprland",
"libre-presenter": "libre-presenter",
"nix-bitcoin": "nix-bitcoin",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable"
}
},

6
flake.nix
View file

@ -19,9 +19,12 @@
nix-bitcoin = {
url = "github:fort-nix/nix-bitcoin/release";
};
libre-presenter = {
url = "gitlab:chriscochrun/church-presenter";
};
};
outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, emacs, nix-bitcoin, ... }:
outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, emacs, nix-bitcoin, libre-presenter, ... }:
let
system = "x86_64-linux";
username = "chris";
@ -71,6 +74,7 @@
./system/syl/configuration.nix
home-manager.nixosModules.home-manager
hyprland.nixosModules.default
# libre-presenter.defaultPackage
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

10
system/dalinar/configuration.nix
View file

@ -233,7 +233,15 @@
};
};
systemd.servics = {
mail-cert-renew = {
enable = true;
serviceConfig = {
Type = "oneshot";
ExecStart = with pkgs.docker "sh -c /home/chris/bin/mail-cert-renew"
};
};
};
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];

6
system/kaladin/configuration.nix
View file

@ -240,6 +240,7 @@ imports =
krename
kwallet-pam
plasma5Packages.kwallet
sierra-breeze-enhanced
libimobiledevice
sddm-kcm
ydotool
@ -254,7 +255,7 @@ imports =
nerdfonts
latte-dock
alacritty
libsForQt5.bismuth
# libsForQt5.bismuth
libnotify
rofi-wayland
waybar
@ -268,6 +269,7 @@ imports =
wayland-utils
# mkchromecast
plocate
# librepresenter.libre-presenter
papirus-icon-theme
phinger-cursors
plasma-hud
@ -361,7 +363,7 @@ imports =
# plasma5Packages.kirigami2
sqlite
fennel
(libsForQt5.callPackage ../../LightlyShaders {})
(with import <nixpkgs> {}; libsForQt5.callPackage ../../LightlyShaders {})
];
nixpkgs.overlays = [

9
system/syl/configuration.nix
View file

@ -260,6 +260,7 @@
krename
kwallet-pam
plasma5Packages.kwallet
sierra-breeze-enhanced
libimobiledevice
sddm-kcm
ydotool
@ -274,7 +275,7 @@
nerdfonts
latte-dock
alacritty
libsForQt5.bismuth
# libsForQt5.bismuth
libnotify
rofi-wayland
waybar
@ -288,6 +289,7 @@
wayland-utils
# mkchromecast
plocate
# librepresenter.libre-presenter
papirus-icon-theme
phinger-cursors
plasma-hud
@ -383,7 +385,10 @@
# plasma5Packages.kirigami2
sqlite
fennel
(libsForQt5.callPackage ../../LightlyShaders {})
(with import <nixpkgs> {}; libsForQt5.callPackage ../../LightlyShaders {})
(with import <nixpkgs> {}; libsForQt5.callPackage /home/chris/dev/church-presenter {})
# (with import <nixpkgs> {}; libsForQt5.callPackage ../../bismuth {})
];
services.emacs = {