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

lots of tweaks

Browse source
This commit is contained in:
Chris Cochrun 2023-05-04 09:31:02 -05:00
parent 7a564aa33b
commit 645a205924
6 changed files with 61 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eww/eww.yuck
View file

@ -338,7 +338,7 @@
:geometry (geometry :geometry (geometry
:x "15px" :x "15px"
:y "3px" :y "3px"
:width "80%" :width "95%"
:height "50px" :height "50px"
:anchor "bottom center") :anchor "bottom center")
:stacking "fg" :stacking "fg"

2
fish/config.fish
View file

@ -1,6 +1,6 @@
#!/usr/bin/env fish #!/usr/bin/env fish
set -U fish_user_paths $HOME/.local/bin $HOME/scripts $HOME/bin $HOME/.doom-emacs/bin $HOME/.emacs.d/bin $HOME/.cargo/bin set -U fish_user_paths $HOME/.local/bin $HOME/scripts $HOME/bin $HOME/.doom-emacs/bin $HOME/.emacs.d/bin $HOME/.cargo/bin $HOME/dev/kde/src/kdesrc-build
set TERM "xterm-256color" set TERM "xterm-256color"
set EDITOR "emacsclient -c -a" set EDITOR "emacsclient -c -a"
set VISUAL "emacsclient -c -a emacs" set VISUAL "emacsclient -c -a emacs"

174
flake.lock
View file

@ -16,28 +16,6 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"cargo2nix": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_2",
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1655189312,
"narHash": "sha256-gpJ57OgIebUpO+7F00VltxSEy6dz2x6HeJ5BcRM8rDA=",
"owner": "cargo2nix",
"repo": "cargo2nix",
"rev": "c149357cc3d17f2849c73eb7a09d07a307cdcfe8",
"type": "github"
},
"original": {
"owner": "cargo2nix",
"ref": "release-0.11.0",
"repo": "cargo2nix",
"type": "github"
}
},
"emacs": { "emacs": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -46,11 +24,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682673816, "lastModified": 1682846727,
"narHash": "sha256-C5zxg5AbMbX3UD2iiWL6fqvp/csTnk8JeXh6PHf7zOI=", "narHash": "sha256-efEp8ziqbj/tdd46qRpaSf7elgNJ48W3x5xLiWRDDAE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "60fe647be71d6f433f4a8f9f22d7430bf0ef58a4", "rev": "0b6c10ab19e79fd85c1bb3ea29c38eb5db464e0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,22 +100,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -169,21 +131,6 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
@ -201,7 +148,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
}, },
@ -226,11 +173,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682663009, "lastModified": 1682779989,
"narHash": "sha256-i5ZDuY5kUBDwbWFUludL2cm6PBb6oj245qTFXSpOkdo=", "narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "43ba4489bd3f9f69519f5f7ebdb76d0455eccbbe", "rev": "3144311f31194b537808ae6848f86f3dbf977d59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -248,11 +195,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1682603803, "lastModified": 1682976507,
"narHash": "sha256-NY9nVAdB7UyInu2vPx/DIUVNZ83t4RdP16QY9DTIn4s=", "narHash": "sha256-RC/zTlkOO1zl4vCw3iCH8G6owaf26gMAaQTOn9IEmGA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "f23455e592bca14e0abd9249de467cc71cd2850e", "rev": "c949173bc9c9f9e8276cba098cb82ed51ad4965b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -284,16 +231,16 @@
}, },
"libre-presenter": { "libre-presenter": {
"inputs": { "inputs": {
"cargo2nix": "cargo2nix", "flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_4", "naersk": "naersk",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1682678762, "lastModified": 1682719556,
"narHash": "sha256-rvMhIYI8q9epsCQgdnzmEhCKbK5XCojmZa4RhyR1wuI=", "narHash": "sha256-LIVglXCuO1B9qaV5gTO+4NbsxuzlLNtICxqlakgBjjo=",
"owner": "chriscochrun", "owner": "chriscochrun",
"repo": "church-presenter", "repo": "church-presenter",
"rev": "a7e3cfa39ffdda1317c0396679479341da7abad5", "rev": "dd1ea7454ea6118c6051a5b9dae3d01ed858b520",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -302,10 +249,28 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1679567394,
"narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=",
"owner": "nix-community",
"repo": "naersk",
"rev": "88cd22380154a2c36799fe8098888f0f59861a15",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"nix-bitcoin": { "nix-bitcoin": {
"inputs": { "inputs": {
"extra-container": "extra-container", "extra-container": "extra-container",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
@ -326,11 +291,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1680876084, "lastModified": 1682836095,
"narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "narHash": "sha256-PdzpJhuXBz71AgWNWMMYLbB8GMMce6QguhQY/6HOOcc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "rev": "e4a21ddcb45ee5f5c85a5d9e9698debf77fb98c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +307,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1682453498, "lastModified": 1682526928,
"narHash": "sha256-WoWiAd7KZt5Eh6n+qojcivaVpnXKqBsVgpixpV2L9CE=", "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8018361fa1d1650ee8d4b96294783cf564e8a7f", "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +338,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1682538316, "lastModified": 1682669017,
"narHash": "sha256-YuHgVsR7S9zxJWHo7lo2ugd+uDC4ESWg1hA4bEZQv3Y=", "narHash": "sha256-Vi+p4y3wnl0/4gcwTdmCO398kKlDaUrNROtf3GOD2NY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "15b75800dce80225b44f067c9012b09de37dfad2", "rev": "7449971a3ecf857b4a554cf79b1d9dcc1a4647d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,27 +370,25 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1654275867, "lastModified": 1682566018,
"narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=", "narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0", "rev": "8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "id": "nixpkgs",
"ref": "release-22.05", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1681126633, "lastModified": 1682526928,
"narHash": "sha256-evQ3Ct/yJDSHej16Hiq+JfxRjgm9FXu/2LBxsyorGdE=", "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db24d86dd8a4769c50d6b7295e81aa280cd93f35", "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,11 +416,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1682526928, "lastModified": 1682692304,
"narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", "narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891", "rev": "937a9d1ee7b1351d8c55fff6611a8edf6e7c1c37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -518,33 +481,6 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"libre-presenter",
"cargo2nix",
"flake-utils"
],
"nixpkgs": [
"libre-presenter",
"cargo2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1653878966,
"narHash": "sha256-T51Gck/vrJZi1m+uTbhEFTRgZmE59sydVONadADv358=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8526d618af012a923ca116be9603e818b502a8db",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"simple-nixos-mailserver": { "simple-nixos-mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",

1
modules/emacs.nix
View file

@ -46,6 +46,7 @@ with lib;
org-re-reveal-ref org-re-reveal-ref
org-re-reveal-citeproc org-re-reveal-citeproc
ox-reveal ox-reveal
ox-hugo
oer-reveal oer-reveal
# ox-spectacle # ox-spectacle
unicode-fonts unicode-fonts

1
pkgs/desktop-packages.nix
View file

@ -41,6 +41,7 @@ with lib;
python310Packages.mutagen python310Packages.mutagen
python310Packages.audiotools python310Packages.audiotools
(mpv.override {scripts = with pkgs.mpvScripts; [ mpris youtube-quality sponsorblock ];}) (mpv.override {scripts = with pkgs.mpvScripts; [ mpris youtube-quality sponsorblock ];})
haruna
ani-cli ani-cli
mov-cli mov-cli
nerdfonts nerdfonts

3
user/home.nix
View file

@ -286,7 +286,8 @@
}; };
home.file.".config/mpv" = { home.file.".config/mpv" = {
source = if builtins.readFile "/etc/hostname" == "syl\n" then ../mpv-syl else ../mpv; source = ../mpv;
recursive = true;
}; };
services.nextcloud-client = { services.nextcloud-client = {