ryan77627/guix-dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Compare commits

base: ryan77627:main
Branches Tags
ryan77627:main
ryan77627:new-bootloader-next
ryan77627:pres
ryan77627:broken-new-portal
ryan77627:temp-broken
..
compare: ryan77627:new-bootloader-next
Branches Tags
ryan77627:main
ryan77627:new-bootloader-next
ryan77627:pres
ryan77627:broken-new-portal
ryan77627:temp-broken

2 commits
main ... new-bootlo

Author SHA1 Message Date
Ryan Schanzenbacher 7f27d13d61
Merge branch 'main' into new-bootloader-next 2024-10-19 23:31:16 -04:00
Ryan Schanzenbacher 3aaeb60f2a
change guix remote to follow my mirror 2024-10-19 22:06:45 -04:00
13 changed files with 89 additions and 622 deletions
Show stats Expand all files Collapse all files

2
channels.scm
View file

@ -1,6 +1,6 @@
(list (channel (list (channel
(name 'guix) (name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git") (url "https://git.rschanz.org/ryan77627/guix.git")
(branch "master") (branch "master")
(commit (commit
"308877be17b2c2c92d972e105e8cc6a782ab4c82") "308877be17b2c2c92d972e105e8cc6a782ab4c82")

27
home-config/home-configuration.scm
View file

@ -15,7 +15,6 @@
(gnu home services shells) (gnu home services shells)
(gnu home services desktop) (gnu home services desktop)
(gnu home services gnupg) (gnu home services gnupg)
(gnu home services fontutils)
(gnu home services) (gnu home services)
(ryan-services pipewire) (ryan-services pipewire)
(ryan-services spotify) (ryan-services spotify)
@ -135,7 +134,7 @@
"signal-desktop" "signal-desktop"
"sc-im" "sc-im"
"git-lfs")) "git-lfs"))
(list my-neovim wl-mirror calcurse-fixed ))) (list my-neovim wl-mirror firefox-wrapped calcurse-fixed )))
;; Below is the list of Home services. To search for available ;; Below is the list of Home services. To search for available
;; services, run 'guix home search KEYWORD' in a terminal. ;; services, run 'guix home search KEYWORD' in a terminal.
@ -156,7 +155,6 @@
("nvim/after/ftplugin/mail/custom.vim" ,(local-file "nvim/config/after/ftplugin/mail/custom.vim")) ("nvim/after/ftplugin/mail/custom.vim" ,(local-file "nvim/config/after/ftplugin/mail/custom.vim"))
("sway" ,(local-file "sway" #:recursive? #t)) ("sway" ,(local-file "sway" #:recursive? #t))
("hypr" ,(local-file "hypr" #:recursive? #t)) ("hypr" ,(local-file "hypr" #:recursive? #t))
("wpaperd" ,(local-file "wpaperd" #:recursive? #t))
("mpv" ,(local-file "mpv" #:recursive? #t)) ("mpv" ,(local-file "mpv" #:recursive? #t))
("foot" ,(local-file "foot" #:recursive? #t)) ("foot" ,(local-file "foot" #:recursive? #t))
("pulse/client.conf" ,(local-file "pulseaudio/client.conf")) ("pulse/client.conf" ,(local-file "pulseaudio/client.conf"))
@ -167,34 +165,15 @@
`((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim")) `((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))
(".ssh/config" ,(local-file "ssh/config")) (".ssh/config" ,(local-file "ssh/config"))
(".icons" ,(local-file "icons" #:recursive? #t)) (".icons" ,(local-file "icons" #:recursive? #t))
;(".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json")) (".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json"))
;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol")) ;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf")) ;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))
(".local/share/fonts" ,(local-file "fonts" #:recursive? #t)) (".fonts" ,(local-file "fonts" #:recursive? #t))
(".gitconfig" ,(local-file "gitconfig")) (".gitconfig" ,(local-file "gitconfig"))
(".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t)) (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))
(".nix-channels" ,(local-file "nix-channels")))) (".nix-channels" ,(local-file "nix-channels"))))
(service home-pipewire-service-type) (service home-pipewire-service-type)
(service home-spotifyd-service-type) (service home-spotifyd-service-type)
; font things for nix to play nice
(simple-service 'additional-fonts-service
home-fontconfig-service-type
(list "~/.nix-profile/share/fonts"
'(match (@ (target "pattern"))
(edit (@ (name "family") (mode "prepend"))
(string "DejaVu Sans")))
'(alias
(family "serif")
(prefer
(family "DejaVu Serif")))
'(alias
(family "sans")
(prefer
(family "DejaVu Sans")))
'(alias
(family "monospace")
(prefer
(family "DejaVu Sans Mono")))))
(service home-dbus-service-type) (service home-dbus-service-type)
;;; trying some changes ;;; trying some changes
;(template-files "." ;(template-files "."

4
home-config/hypr/autostart.sh
View file

@ -11,9 +11,7 @@ nice -n13 swww init &
#~/.config/hypr/wallpaper-daemon.sh & #~/.config/hypr/wallpaper-daemon.sh &
wpaperd -d & wpaperd -d &
#swayidle -w timeout 300 'swaylock --screenshots --clock --indicator --grace 3 --fade-in 1 --effect-blur 7x5 --effect-greyscale' timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f -c 000000' & swayidle -w timeout 300 'swaylock --screenshots --clock --indicator --grace 3 --fade-in 1 --effect-blur 7x5 --effect-greyscale' timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f -c 000000' &
hypridle &
syncthing serve --no-browser & syncthing serve --no-browser &

16
home-config/hypr/hypridle.conf
View file

@ -1,16 +0,0 @@
general {
lock_cmd = pidof hyprlock || hyprlock
before_sleep_cmd = loginctl lock-session
after_sleep_cmd = hyprctl dispatch dpms on
}
listener {
timeout = 300
on-timeout = loginctl lock-session
}
listener {
timeout = 600
on-timeout = hyprctl dispatch dpms off
on-resume = hyprctl dispatch dpms on
}

21
home-config/hypr/hyprland.conf
View file

@ -14,8 +14,6 @@ env = HYPRCURSOR_SIZE,26
env = XCURSOR_THEME,XCursor-Pro-Dark env = XCURSOR_THEME,XCursor-Pro-Dark
env = XCURSOR_SIZE,26 env = XCURSOR_SIZE,26
env = AQ_NO_MODIFIERS,1
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
@ -74,12 +72,10 @@ decoration {
new_optimizations = on new_optimizations = on
} }
shadow { drop_shadow = yes
enabled = true shadow_range = 4
range = 4 shadow_render_power = 3
render_power = 3 col.shadow = rgba(1a1a1aee)
color = rgba(1a1a1aee)
}
} }
animations { animations {
@ -207,11 +203,8 @@ bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow bindm = $mainMod, mouse:273, resizewindow
# Bind mainMod + L to screenlocker # Bind mainMod + L to screenlocker
bind = $mainMod, L, exec, hyprlock bind = $mainMod, L, exec, swaylock --screenshots --clock --indicator --fade-in 0.3 --effect-blur 7x5 --effect-greyscale
bind = $mainMod SHIFT, L, exec, loginctl suspend bind = $mainMod SHIFT, L, exec, swaylock --screenshots --clock --indicator --effect-blur 7x5 --effect-greyscale & sleep 0.5; loginctl suspend
# Keybind to toggle "performance mode" (toggles GPU intensive things)
bind = $mainMod, F1, exec, ~/.config/hypr/perf_mode.sh
# Keybind for screenshot # Keybind for screenshot
bind = $mainMod SHIFT, S, exec, grimblast copy area bind = $mainMod SHIFT, S, exec, grimblast copy area
@ -243,7 +236,7 @@ windowrulev2 = suppressevent fullscreen maximize, class:^(firefox)$, title:^(Fir
# Weather # Weather
windowrulev2 = float,class:^(ala-wttr)$ windowrulev2 = float,class:^(ala-wttr)$
windowrulev2 = size 822 1026, class:^(ala-wttr)$ windowrulev2 = size 740 712, class:^(ala-wttr)$
# Floating terminal # Floating terminal
windowrulev2 = float,class:^(float-foot)$ windowrulev2 = float,class:^(float-foot)$

4
home-config/hypr/hyprlock.conf
View file

@ -1,7 +1,6 @@
background { background {
monitor = monitor =
#path = /home/ryan/.config/hypr/Wallpapers/static/autumn1.png path = /home/ryan/.config/hypr/Wallpapers/static/autumn1.png
path = screenshot
# all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
blur_passes = 2 # 0 disables blurring blur_passes = 2 # 0 disables blurring
@ -53,5 +52,4 @@ label {
position = 0, 300 position = 0, 300
halign = center halign = center
valign = center valign = center
font_family = Lilex Nerd Font
} }

11
home-config/hypr/kanshi.conf
View file

@ -2,6 +2,11 @@ profile {
output "AU Optronics 0x103D Unknown" enable output "AU Optronics 0x103D Unknown" enable
} }
profile tylerdesk {
output "AU Optronics 0x103D Unknown" disable
output "Dell Inc. DELL U3421WE 6WK8753" enable
}
profile emilydesk { profile emilydesk {
output "AU Optronics 0x103D Unknown" disable output "AU Optronics 0x103D Unknown" disable
output "Dell Inc. DELL U2422H JN4SF83" position 0,0 mode 1920x1080 output "Dell Inc. DELL U2422H JN4SF83" position 0,0 mode 1920x1080
@ -14,9 +19,3 @@ profile justindesk {
output "Dell Inc. DELL U2417H XVNNT7CDC80L" position 1920,0 mode 1920x1080 output "Dell Inc. DELL U2417H XVNNT7CDC80L" position 1920,0 mode 1920x1080
output "Dell Inc. DELL U2417H XVNNT82M978L" position 3840,0 mode 1920x1080 output "Dell Inc. DELL U2417H XVNNT82M978L" position 3840,0 mode 1920x1080
} }
profile homedesk {
output "AU Optronics 0x103D Unknown" disable
output "Samsung Electric Company C27F390 H1AK500000" position 0,0 mode 1920x1080
output "Samsung Electric Company S22R35x H4TNA01683" position 1920,0 mode 1920x1080
}

14
home-config/hypr/perf_mode.sh
View file

@ -1,14 +0,0 @@
#!/usr/bin/env bash
HYPRGAMEMODE=$(hyprctl getoption animations:enabled | awk 'NR==1{print $2}')
if [ "$HYPRGAMEMODE" = 1 ] ; then
hyprctl --batch "\
keyword animations:enabled 0;\
keyword decoration:drop_shadow 0;\
keyword decoration:blur:enabled 0;\
keyword general:gaps_in 0;\
keyword general:gaps_out 0;\
keyword general:border_size 1;\
keyword decoration:rounding 0"
exit
fi
hyprctl reload

233
home-config/nix-home-manager/flake.lock
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730968822, "lastModified": 1727261104,
"narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", "rev": "b82fdaff917582a9d568969e15e61b398c71e990",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,22 +33,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
@ -64,28 +48,6 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"hyprland",
"pre-commit-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -93,17 +55,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731604581, "lastModified": 1729321331,
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
"type": "github" "type": "github"
} }
}, },
@ -123,11 +85,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728669738, "lastModified": 1727532803,
"narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,21 +109,20 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": "pre-commit-hooks",
"systems": "systems", "systems": "systems",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1731162467, "lastModified": 1728478479,
"narHash": "sha256-b0w2XOVCuEdBIiTpKaaeSesKux1Q51YWEWdKbljDXPE=", "narHash": "sha256-AbfdIlK92oWpI39xlIaUekPeL9u95sXzxVsSqhIMfIc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "a425fbebe4cf4238e48a42f724ef2208959d66cf", "rev": "4520b30d498daca8079365bdb909a8dea38e8d55",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"ref": "v0.45.0", "ref": "v0.44.1",
"repo": "hyprland", "repo": "hyprland",
"type": "github" "type": "github"
} }
@ -178,11 +139,38 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728345020, "lastModified": 1727451107,
"narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "a7c183800e74f337753de186522b9017a07a8cee", "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprland-protocols_2": {
"inputs": {
"nixpkgs": [
"hyprland",
"xdph",
"nixpkgs"
],
"systems": [
"hyprland",
"xdph",
"systems"
]
},
"locked": {
"lastModified": 1721326555,
"narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,11 +195,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728168612, "lastModified": 1725997860,
"narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -256,11 +244,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730968903, "lastModified": 1727300645,
"narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=", "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9", "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -368,57 +356,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1731603729, "lastModified": 1729168305,
"narHash": "sha256-ChqaWsSIi+8zprudu16K3MskXr7iORzMGmYutWHCmKQ=", "narHash": "sha256-jmhxZnrlOyLEMUL2+JkVfkN0XWXI5uE6EB5kVZFR0fo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f49e820fbc9450736bb6ba982a2ff0a8d014ad1e", "rev": "2a55bdc8cfcf41551323a4a6cef24d3f566c824d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f49e820fbc9450736bb6ba982a2ff0a8d014ad1e", "rev": "2a55bdc8cfcf41551323a4a6cef24d3f566c824d",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1730814269,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github" "type": "github"
} }
}, },
@ -428,29 +376,7 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprpicker-git": "hyprpicker-git", "hyprpicker-git": "hyprpicker-git",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"wpaperd": "wpaperd"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"wpaperd",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729391507,
"narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "784981a9feeba406de38c1c9a3decf966d853cca",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
} }
}, },
"systems": { "systems": {
@ -483,50 +409,9 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"wpaperd": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay",
"systems": "systems_3"
},
"locked": {
"lastModified": 1731514601,
"narHash": "sha256-NnDxLG02klftsWl8i8ZmRIUeIPCx2HtBsEFQwzbJ3ws=",
"owner": "danyspin97",
"repo": "wpaperd",
"rev": "7865433233ff58f33ca4af94fd5031e26f409f52",
"type": "github"
},
"original": {
"owner": "danyspin97",
"repo": "wpaperd",
"rev": "7865433233ff58f33ca4af94fd5031e26f409f52",
"type": "github"
}
},
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": "hyprland-protocols_2",
"hyprland",
"hyprland-protocols"
],
"hyprlang": [ "hyprlang": [
"hyprland", "hyprland",
"hyprlang" "hyprlang"
@ -549,11 +434,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730743262, "lastModified": 1727524473,
"narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
home-config/nix-home-manager/flake.nix
View file

@ -3,9 +3,9 @@
inputs = { inputs = {
# Specify the source of Home Manager and Nixpkgs. # Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixos/nixpkgs/f49e820fbc9450736bb6ba982a2ff0a8d014ad1e"; nixpkgs.url = "github:nixos/nixpkgs/2a55bdc8cfcf41551323a4a6cef24d3f566c824d";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10"; url = "github:nix-community/home-manager/122f70545b29ccb922e655b08acfe05bfb44ec68";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprpicker-git = { hyprpicker-git = {
@ -13,28 +13,22 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland = { hyprland = {
url = "github:hyprwm/hyprland/v0.45.0"; url = "github:hyprwm/hyprland/v0.44.1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixgl = { nixgl = {
url = "github:nix-community/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a"; url = "github:nix-community/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
wpaperd = {
url = "github:danyspin97/wpaperd/7865433233ff58f33ca4af94fd5031e26f409f52";
inputs.nixpkgs.follows = "nixpkgs";
};
#mozff.url = "github:mozilla/nixpkgs-mozilla";
}; };
outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, nixgl, wpaperd, ... }@inputs: outputs = { nixpkgs, home-manager, hyprpicker-git, hyprland, nixgl, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
overlays = [ overlays = [
hyprpicker-git.overlays.default hyprpicker-git.overlays.default
nixgl.overlay nixgl.overlay
#mozff.overlays.firefox
]; ];
in { in {
homeConfigurations."ryan" = home-manager.lib.homeManagerConfiguration { homeConfigurations."ryan" = home-manager.lib.homeManagerConfiguration {
@ -43,20 +37,19 @@
# Specify your home configuration modules here, for example, # Specify your home configuration modules here, for example,
# the path to your home.nix. # the path to your home.nix.
modules = [ modules = [
{nixpkgs.overlays = overlays;}
./home.nix ./home.nix
{nixpkgs.overlays = overlays;}
{ {
_module.args = { _module.args = {
inherit hyprland; inherit hyprland;
inherit nixgl; inherit nixgl;
inherit wpaperd;
}; };
} }
]; ];
# Optionally use extraSpecialArgs # Optionally use extraSpecialArgs
# to pass through arguments to home.nix # to pass through arguments to home.nix
# extraSpecialArgs = { inherit overlays; }; #extraSpecialArgs = { inherit inputs; };
}; };
}; };
} }

339
home-config/nix-home-manager/home.nix
View file

@ -1,14 +1,5 @@
{ config, pkgs, hyprland, nixgl, wpaperd, ... }: { config, pkgs, hyprland, nixgl, ... }:
let
lock-false = {
Value = false;
Status = "locked";
};
lock-true = {
Value = true;
Status = "locked";
};
in
{ {
# 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
# manage. # manage.
@ -29,319 +20,9 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
#targets.genericLinux.enable = true; #targets.genericLinux.enable = true;
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
fonts.fontconfig.defaultFonts = {
monospace = [ "DejaVu Sans Mono" ];
sansSerif = [ "DejaVu Sans" ];
serif = [ "DejaVu Serif" ];
};
# wayland.windowManager.hyprland.enable = true; # wayland.windowManager.hyprland.enable = true;
# Install firefox and add some customizations
programs.firefox = {
enable = true;
policies = {
EnableTrackingProtection = {
Value = true;
Locked = true;
Cryptomining = true;
Fingerprinting = true;
EmailTracking = true;
};
UserMessaging = {
WhatsNew = false;
ExtensionRecommendations = false;
FeatureRecommendations = false;
UrlbarInterventions = false;
SkipOnboarding = true;
MoreFromMozilla = false;
Labs = false;
Locked = true;
};
DisableAppUpdate = true;
DisableAccounts = true;
DisableFirefoxAccounts = true;
DisableFirefoxStudies = true;
DisablePocket = true;
DisableTelemetry = true;
AutofillAddressEnabled = false;
AutofillCreditCardEnabled = false;
DisableMasterPasswordCreation = true;
PasswordManagerEnabled = false;
PrimaryPassword = false;
OfferToSaveLogins = false;
NoDefaultBookmarks = true;
OverrideFirstRunPage = "";
OverridePostUpdatePage = "";
FirefoxHome = {
Search = true;
TopSites = true;
SponsoredTopSites = false;
Highlights = false;
Pocket = false;
SponsoredPocket = false;
Snippets = false;
Locked = true;
};
SearchSuggestEnabled = true;
FirefoxSuggest = {
WebSuggestions = true;
SponsoredSuggestions = false;
ImproveSuggest = false;
Locked = true;
};
PictureInPicture = lock-true;
HardwareAcceleration = true;
Certificates = {
ImportEnterpriseRoots = true;
};
ExtensionSettings = {
#"*".installation_mode = "blocked";
# uBlock Origin
"uBlock0@raymondhill.net" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
installation_mode = "force_installed";
};
# Bitwarden
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
installation_mode = "force_installed";
};
# SponsorBlock
"sponsorBlocker@ajay.app" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/sponsorblock/latest.xpi";
installation_mode = "force_installed";
};
# DeArrow
"deArrow@ajay.app" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/dearrow/latest.xpi";
installation_mode = "force_installed";
};
# Return Youtube Dislike
"{762f9885-5a13-4abd-9c77-433dcd38b8fd}" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/return-youtube-dislikes/latest.xpi";
installation_mode = "force_installed";
};
# Youtube Nonstop
"{0d7cafdd-501c-49ca-8ebb-e3341caaa55e}" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/youtube-nonstop/latest.xpi";
installation_mode = "force_installed";
};
# Sidebery
"{3c078156-979c-498b-8990-85f7987dd929}" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi";
installation_mode = "normal_installed";
};
# TamperMonkey
"firefox@tampermonkey.net" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/tampermonkey/latest.xpi";
installation_mode = "force_installed";
};
# Floccus
"floccus@handmadeideas.org" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/floccus/latest.xpi";
installation_mode = "force_installed";
};
};
Preferences = {
"browser.startup.homepage" = "https://d.in.rschanz.org";
"extensions.activeThemeID" = {
Value = "firefox-compact-dark@mozilla.org";
Status = "locked";
};
"toolkit.legacyUserProfileCustomizations.stylesheets" = lock-true;
"xpinstall.whitelist.required" = lock-true;
"dom.webgpu.enabled" = lock-true;
"media.eme.enabled" = lock-true;
"general.autoScroll" = lock-true;
"general.smoothScroll" = lock-true;
"browser.crashReports.unsubmittedCheck.autoSubmit2" = lock-false;
"browser.aboutConfig.showWarning" = lock-false;
};
};
profiles.${config.home.username} = {
name = "${config.home.username}";
isDefault = true;
containersForce = true;
containers = {
rit = {
name = "RIT";
color = "orange";
icon = "dollar";
id = 1;
};
ritwork = {
name = "RIT Work";
color = "green";
icon = "briefcase";
id = 2;
};
other = {
name = "Other";
color = "blue";
icon = "fingerprint";
id = 3;
};
};
search = {
force = true;
default = "DuckDuckGo";
order = ["DuckDuckGo" "Google"];
engines = {
"Nix Packages" = {
urls = [
{
template = "https://search.nixos.org/packages";
params = [
{
name = "type";
value = "packages";
}
{
name = "channel";
value = "unstable";
}
{
name = "query";
value = "{searchTerms}";
}
];
}
];
icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = ["@np"];
};
};
};
userChrome = "
#main-window #titlebar {
overflow: hidden;
transition: height 0.3s 0.3s !important;
}
/* Default state: Set initial height to enable animation */
#main-window #titlebar { height: 3em !important; }
#main-window[uidensity=\"touch\"] #titlebar { height: 3.35em !important; }
#main-window[uidensity=\"compact\"] #titlebar { height: 2.7em !important; }
/* Hidden state: Hide native tabs strip */
#main-window[titlepreface*=\"​\"] #titlebar { height: 0 !important; }
/* Hidden state: Fix z-index of active pinned tabs */
#main-window[titlepreface*=\"​\"] #tabbrowser-tabs { z-index: 0 !important; }
/* Sidebery expand on mouse-over and hide otherwise */
/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_sidebar.css made available under Mozilla Public License v. 2.0
See the above repository for updates as well as full license text. */
/* Show sidebar only when the cursor is over it */
/* The border controlling sidebar width will be removed so you'll need to modify these values to change width */
#sidebar-box{
--uc-sidebar-width: 60px;
--uc-sidebar-hover-width: 230px;
--uc-autohide-sidebar-delay: 200ms; /* Wait 0.2s before hiding sidebar */
--uc-autohide-transition-duration: 115ms;
--uc-autohide-transition-type: linear;
--browser-area-z-index-sidebar: 3;
position: relative;
min-width: var(--uc-sidebar-width) !important;
width: var(--uc-sidebar-width) !important;
max-width: var(--uc-sidebar-width) !important;
z-index: var(--browser-area-z-index-sidebar,3);
}
#sidebar-box[positionend]{ direction: rtl }
#sidebar-box[positionend] > *{ direction: ltr }
#sidebar-box[positionend]:-moz-locale-dir(rtl){ direction: ltr }
#sidebar-box[positionend]:-moz-locale-dir(rtl) > *{ direction: rtl }
#main-window[sizemode=\"fullscreen\"] #sidebar-box{ --uc-sidebar-width: 1px; }
#sidebar-splitter{ display: none }
#sidebar-header{
overflow: hidden;
color: var(--chrome-color, inherit) !important;
padding-inline: 0 !important;
}
#sidebar-header::before,
#sidebar-header::after{
content: \"\";
display: flex;
padding-left: 8px;
}
#sidebar-header,
#sidebar{
transition: min-width var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important;
min-width: var(--uc-sidebar-width) !important;
will-change: min-width;
}
#sidebar-box:hover > #sidebar-header,
#sidebar-box:hover > #sidebar{
min-width: var(--uc-sidebar-hover-width) !important;
transition-delay: 0ms !important;
}
.sidebar-panel{
background-color: transparent !important;
color: var(--newtab-text-primary-color) !important;
}
.sidebar-panel #search-box{
-moz-appearance: none !important;
background-color: rgba(249,249,250,0.1) !important;
color: inherit !important;
}
/* Add sidebar divider and give it background */
#sidebar,
#sidebar-header{
background-color: inherit !important;
border-inline: 1px solid rgb(80,80,80);
border-inline-width: 0px 1px;
}
#sidebar-box:not([positionend]) > :-moz-locale-dir(rtl),
#sidebar-box[positionend] > *{
border-inline-width: 1px 0px;
}
/* Move statuspanel to the other side when sidebar is hovered so it doesn't get covered by sidebar */
#sidebar-box:not([positionend]):hover ~ #appcontent #statuspanel{
inset-inline: auto 0px !important;
}
#sidebar-box:not([positionend]):hover ~ #appcontent #statuspanel-label{
margin-inline: 0px !important;
border-left-style: solid !important;
}
/* Remove the tabs label and move the Sidebary icon to the center of the box */
#sidebar-box:hover [id=\"sidebar-icon\"] {
transform: translateX(0px) !important;
transition-delay: 0ms !important;
}
#sidebar-box [id=\"sidebar-icon\"] {
transform: translateX(9px);
transition: transform var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important;
}
#sidebar-box [id=\"sidebar-title\"] {
visibility: hidden !important;
transition: visibility var(--uc-autohide-transition-duration) var(--uc-autohide-transition-type) var(--uc-autohide-sidebar-delay) !important;
}
#sidebar-box:hover [id=\"sidebar-title\"] {
visibility: visible !important;
transition-delay: 0ms !important;
}
";
};
};
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -357,12 +38,14 @@
aerc aerc
pkg-config pkg-config
wttrbar wttrbar
swww
wl-clip-persist wl-clip-persist
gifski gifski
waypaper waypaper
gdu gdu
spotify-player spotify-player
hyprpicker hyprpicker
hyprlock
xwayland xwayland
xdg-desktop-portal xdg-desktop-portal
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
@ -370,27 +53,15 @@
imv imv
libva libva
libvdpau libvdpau
#wpaperd wpaperd
hypridle
#latest.firefox-nightly-bin
eza
# Wrapped programs for some env variables
(pkgs.writeScriptBin "hyprlock" ''
#! ${pkgs.bash}/bin/bash
export LD_PRELOAD="/run/current-system/profile/lib/libpam.so.0:/run/current-system/profile/lib/libfontconfig.so:$LD_PRELOAD"
exec ${pkgs.hyprlock}/bin/hyprlock "$@"
'')
# Flakes specific things defined in flake.nix # Flakes specific things defined in flake.nix
hyprland.packages.${pkgs.system}.default hyprland.packages.${pkgs.system}.default
hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
nixgl.packages.${pkgs.system}.nixGLIntel nixgl.packages.${pkgs.system}.nixGLIntel
wpaperd.packages.${pkgs.system}.wpaperd
# Fonts! # Fonts!
noto-fonts noto-fonts
dejavu_fonts
liberation_ttf liberation_ttf
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji

4
home-config/wpaperd/config.toml
View file

@ -1,4 +0,0 @@
[default]
duration = "30m"
path = "~/.config/hypr/Wallpapers/static/"
transition-time = 2000

17
modules/ryan-config/base-system.scm
View file

@ -4,7 +4,6 @@
#:use-module (gnu system setuid) #:use-module (gnu system setuid)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages avahi) #:use-module (gnu packages avahi)
#:use-module (gnu packages wm)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages shells) #:use-module (gnu packages shells)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
@ -130,7 +129,6 @@
;"swaylock-effects" ;"swaylock-effects"
"fuzzel" "fuzzel"
"foot" "foot"
"linux-pam" ; installed directly to get libs in profile directly
"pinentry-qt" "pinentry-qt"
"adwaita-icon-theme" "adwaita-icon-theme"
"hicolor-icon-theme" "hicolor-icon-theme"
@ -163,7 +161,7 @@
"wireshark" "wireshark"
"webkitgtk-with-libsoup2" ; Needed for Go wails development "webkitgtk-with-libsoup2" ; Needed for Go wails development
"zsh")) "zsh"))
(list my-ca-certs virt-manager-ovmf bluez-ryan blueman-ryan) (list my-ca-certs virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new)
%my-base-packages )) %my-base-packages ))
;; Below is the list of system services. To search for available ;; Below is the list of system services. To search for available
@ -190,24 +188,11 @@
(socket "/var/run/tailscale/tailscaled.sock"))) (socket "/var/run/tailscale/tailscaled.sock")))
(service containerd-service-type) (service containerd-service-type)
(service nix-service-type) (service nix-service-type)
(simple-service 'hyprlock-pam pam-root-service-type
(list
(pam-service
(name "hyprlock")
(auth
(list
(pam-entry (control "include")
(module "login")))))))
(service libvirt-service-type (service libvirt-service-type
(libvirt-configuration (libvirt-configuration
(libvirt libvirt-ovmf) (libvirt libvirt-ovmf)
(unix-sock-group "libvirt"))) (unix-sock-group "libvirt")))
(service virtlog-service-type) (service virtlog-service-type)
;(service screen-locker-service-type
; (screen-locker-configuration
; (name "hyprlock")
; (program (file-append swaylock "/bin/swaylock"))
; (using-pam? #t)))
(simple-service 'spice-polkit polkit-service-type (list spice-gtk)) (simple-service 'spice-polkit polkit-service-type (list spice-gtk))
(simple-service 'hwdb-creation etc-service-type (list `("udev-here-oneoneone" ,(plain-file "issue" "test\n")))) (simple-service 'hwdb-creation etc-service-type (list `("udev-here-oneoneone" ,(plain-file "issue" "test\n"))))
(service bluetooth-service-type (service bluetooth-service-type