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

[fix] broken git stuff oops

Browse source
This commit is contained in:
Chris Cochrun 2026-05-08 14:50:40 -05:00
parent bc0987c09a
commit 20ff907a08
6 changed files with 0 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

3
home/modules/niri.nix
View file

@ -112,10 +112,7 @@ in
};
programs.niri = {
# enable = true;
<<<<<<< HEAD
=======
package = pkgs.niri-stable;
>>>>>>> 4827e2d (updates?)
settings = {
prefer-no-csd = true;
binds = with config.lib.niri.actions; let

4
modules/desktop.nix
View file

@ -19,11 +19,7 @@ in
boot = {
<<<<<<< HEAD
kernelPackages = pkgs.linuxPackages_zen;
=======
kernelPackages = pkgs.linuxPackages_6_18;
>>>>>>> 4827e2d (updates?)
kernelParams = [ "mem_sleep_default=deep" "nvme.noacpi=1" ];
};

4
modules/gaming.nix
View file

@ -107,11 +107,7 @@ with lib;
};
environment.systemPackages = with pkgs; [
airshipper
<<<<<<< HEAD
lutris
=======
# lutris
>>>>>>> 4827e2d (updates?)
heroic
protonup-qt
winePackages.waylandFull

8
pkgs/desktop-packages.nix
View file

@ -16,11 +16,7 @@
# kdePackages.ark
harper
mumble
<<<<<<< HEAD
niri
=======
#niri
>>>>>>> 4827e2d (updates?)
bluetui
# pantalaimon
ifuse
@ -40,11 +36,7 @@
kdePackages.ffmpegthumbs
kdePackages.kdegraphics-thumbnailers
kdePackages.kdesdk-thumbnailers
<<<<<<< HEAD
inputs.affinity-nix.packages.x86_64-linux.v3
=======
inputs.affinity-nix.packages.x86_64-linux.affinity-v3
>>>>>>> 4827e2d (updates?)
android-tools
# xfce.thunar
# xfce.tumbler

20
scripts/lfgimg.lisp
View file

@ -1,14 +1,3 @@
<<<<<<< HEAD
;; #!/run/current-system/sw/bin/sbcl --script
;; (load "~/quicklisp/setup.lisp")
;; (ql:quickload '(drakma lquery))
(defun get-images ()
(loop for i from 748 to 1489 do
(let* ((request (drakma:http-request
(concatenate 'string "https://www.lfg.co/page/" (write-to-string i))))
=======
#!/usr/bin/env -S sbcl --script
(load "~/quicklisp/setup.lisp")
@ -18,29 +7,20 @@
(loop for i from 1490 to 1734 do
(let* ((request (drakma:http-request
(concatenate 'string "https://www.lfg.co/read/comic/" (write-to-string i))))
>>>>>>> 4827e2d (updates?)
(parsed-content (lquery:$ (lquery:initialize request)))
(url (vector-pop (lquery:$ parsed-content "img" (attr :src))))
(img (drakma:http-request url)))
(if (not (search ".jpg" url))
(with-open-file (stream
<<<<<<< HEAD
(concatenate 'string "/home/chris/Pictures/lfg/" (write-to-string i) ".gif")
=======
(concatenate 'string "/home/chris/pics/lfg/" (write-to-string i) ".gif")
>>>>>>> 4827e2d (updates?)
:direction :output
:if-exists :supersede
:if-does-not-exist :create
:element-type 'unsigned-byte)
(write-sequence img stream))
(with-open-file (stream
<<<<<<< HEAD
(concatenate 'string "/home/chris/Pictures/lfg/" (write-to-string i) ".jpg")
=======
(concatenate 'string "/home/chris/pics/lfg/" (write-to-string i) ".jpg")
>>>>>>> 4827e2d (updates?)
:direction :output
:if-exists :supersede
:if-does-not-exist :create

30
systems/kaladin/hardware-configuration.nix
View file

@ -12,27 +12,6 @@
fileSystems."/" =
<<<<<<< HEAD
{ device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
fsType = "btrfs";
options = [ "subvol=@" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
fsType = "btrfs";
options = [ "subvol=@home" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
};
fileSystems."/snapshots" =
{ device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
fsType = "btrfs";
options = [ "subvol=@snapshots" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/1D14-97A8";
=======
{ device = "/dev/disk/by-label/ROOT";
fsType = "btrfs";
options = [ "subvol=root" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
@ -52,27 +31,18 @@
fileSystems."/boot" =
{ device = "/dev/disk/by-label/BOOT";
>>>>>>> 4827e2d (updates?)
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
fileSystems."/run/media/chris/Storage" =
<<<<<<< HEAD
{ device = "/dev/disk/by-uuid/4c7d4273-7b72-4aa8-8e1c-e281543d06cb";
=======
{ device = "/dev/disk/by-label/Storage";
>>>>>>> 4827e2d (updates?)
fsType = "btrfs";
options = [ "noatime" "space_cache=v2" "compress=zstd:1" ];
};
fileSystems."/run/media/chris/backup" =
<<<<<<< HEAD
{ device = "/dev/disk/by-uuid/4286b9ef-e8ed-49a0-9eec-91b8ee05b2cb";
=======
{ device = "/dev/disk/by-label/backup";
>>>>>>> 4827e2d (updates?)
fsType = "ext4";
};