From 683463ec50317c2c320990f4e4a611401b89eb7a Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 5 Dec 2024 13:36:23 -0600 Subject: [PATCH] updates --- .config/qutebrowser/autoconfig.yml | 54 --------- .../bookmarks/#%2Aediff-merge%2A#8ALfXt# | 8 -- .config/qutebrowser/bookmarks/urls | 6 - .config/qutebrowser/qsettings/QtProject.conf | 8 -- .config/qutebrowser/quickmarks | 6 - flake.lock | 112 +++++++++--------- home/home.nix | 12 -- modules/desktop.nix | 2 +- pkgs/desktop-packages.nix | 5 +- 9 files changed, 60 insertions(+), 153 deletions(-) delete mode 100644 .config/qutebrowser/autoconfig.yml delete mode 100644 .config/qutebrowser/bookmarks/#%2Aediff-merge%2A#8ALfXt# delete mode 100644 .config/qutebrowser/bookmarks/urls delete mode 100644 .config/qutebrowser/qsettings/QtProject.conf delete mode 100644 .config/qutebrowser/quickmarks diff --git a/.config/qutebrowser/autoconfig.yml b/.config/qutebrowser/autoconfig.yml deleted file mode 100644 index b890b7c..0000000 --- a/.config/qutebrowser/autoconfig.yml +++ /dev/null @@ -1,54 +0,0 @@ -# If a config.py file exists, this file is ignored unless it's explicitly loaded -# via config.load_autoconfig(). For more information, see: -# https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/configuring.asciidoc#loading-autoconfigyml -# DO NOT edit this file by hand, qutebrowser will overwrite it. -# Instead, create a config.py - see :help for details. - -config_version: 2 -settings: - colors.webpage.darkmode.enabled: - global: true - content.desktop_capture: - https://jitsi.tfcconnection.org: true - content.geolocation: - https://faithlife.com: false - https://openweathermap.org: false - https://staff.tfcconnection.org: true - content.media.audio_capture: - https://jitsi.tfcconnection.org: true - https://staff.tfcconnection.org: true - content.media.audio_video_capture: - global: ask - https://jitsi.riot.im: false - https://jitsi.tfcconnection.org: true - https://staff.tfcconnection.org: true - content.media.video_capture: - https://jitsi.tfcconnection.org: true - https://staff.tfcconnection.org: true - content.notifications.enabled: - https://jelly.cochrun.xyz: true - https://na.op.gg: false - https://nc.cochrun.xyz: false - https://staff.tfcconnection.org: true - https://teams.microsoft.com: true - https://toolbox.iskysoft.com: false - https://www.dailymail.co.uk: false - https://www.facebook.com: false - https://www.g2a.com: false - https://www.pocket-lint.com: false - https://www.reddit.com: false - https://www.websitebuilderexpert.com: false - https://www.youtube.com: false - content.register_protocol_handler: - https://calendar.google.com?cid=%25s: false - https://outlook.live.com?mailtouri=%25s: false - https://outlook.office.com?mailtouri=%25s: false - https://staff.tfcconnection.org: true - scrolling.bar: - global: overlay - statusbar.show: - global: in-mode - tabs.show: - global: switching - zoom.default: - global: 150% diff --git a/.config/qutebrowser/bookmarks/#%2Aediff-merge%2A#8ALfXt# b/.config/qutebrowser/bookmarks/#%2Aediff-merge%2A#8ALfXt# deleted file mode 100644 index 83f6b84..0000000 --- a/.config/qutebrowser/bookmarks/#%2Aediff-merge%2A#8ALfXt# +++ /dev/null @@ -1,8 +0,0 @@ -https://yewtu.be/feed/subscriptions Subscriptions - YewTube -https://portal.azure.com/#@tfcconnection.org/dashboard/private/e5f3455d-3737-47d8-852b-1847a3b4801b Dashboard - Microsoft Azure -https://asciiflow.com/#/ ASCIIFlow -<<<<<<< HEAD -https://photos.cochrun.xyz/people/new PhotoPrism: People -https://staff.tfcconnection.org/apps/files/?dir=/TFC%20Documents&fileid=340 TFC Documents - Files - TFC Staff -https://www.tfcconnection.org/wp-login.php Log In ‹ Teens For Christ Connection — WordPress -https://icons8.com/icons/authors/SYgaDvCu3ALR/kiranshastry/external-kiranshastry-lineal-color-kiranshastry/external-man-accessories-kiranshastry-lineal-color-kiranshastry Man Accessories Icons free by kiranshastry Download available in PNG, PDF, SVG diff --git a/.config/qutebrowser/bookmarks/urls b/.config/qutebrowser/bookmarks/urls deleted file mode 100644 index b3183d4..0000000 --- a/.config/qutebrowser/bookmarks/urls +++ /dev/null @@ -1,6 +0,0 @@ -https://yewtu.be/feed/subscriptions Subscriptions - YewTube -https://portal.azure.com/#@tfcconnection.org/dashboard/private/e5f3455d-3737-47d8-852b-1847a3b4801b Dashboard - Microsoft Azure -https://asciiflow.com/#/ ASCIIFlow -https://photos.cochrun.xyz/people/new PhotoPrism: People -https://staff.tfcconnection.org/apps/files/?dir=/TFC%20Documents&fileid=340 TFC Documents - Files - TFC Staff -https://www.tfcconnection.org/wp-login.php Log In ‹ Teens For Christ Connection — WordPress diff --git a/.config/qutebrowser/qsettings/QtProject.conf b/.config/qutebrowser/qsettings/QtProject.conf deleted file mode 100644 index 431371c..0000000 --- a/.config/qutebrowser/qsettings/QtProject.conf +++ /dev/null @@ -1,8 +0,0 @@ -[FileDialog] -history=file:///home/chris/Videos/paul -lastVisited=file:///home/chris/Videos/paul -qtVersion=5.15.3 -shortcuts=file:, file:///home/chris, file:///home/chris/storage/tfc -sidebarWidth=116 -treeViewHeader=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x2\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x2L\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xff\0\0\0\x1\0\0\0\0\0\0\0X\0\0\0\x1\0\0\0\0\0\0\0X\0\0\0\x1\0\0\0\0\0\0\0\x9d\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\xff\xff\xff\xff) -viewMode=List diff --git a/.config/qutebrowser/quickmarks b/.config/qutebrowser/quickmarks deleted file mode 100644 index 7db8091..0000000 --- a/.config/qutebrowser/quickmarks +++ /dev/null @@ -1,6 +0,0 @@ -awe https://awesomewm.org/apidoc/ -od https://odysee.com/$/following -nc https://staff.tfcconnection.org/apps/dashboard/ -nch https://nc.cochrun.xyz/apps/files/ -bw https://bitwarden.tfcconnection.org/#/vault -azu https://portal.azure.com/#@tfcconnection.org/dashboard/private/e5f3455d-3737-47d8-852b-1847a3b4801b diff --git a/flake.lock b/flake.lock index b15bd66..e1d5ad3 100644 --- a/flake.lock +++ b/flake.lock @@ -95,11 +95,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "type": "github" }, "original": { @@ -228,11 +228,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -260,11 +260,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -313,16 +313,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "46.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } @@ -334,11 +334,11 @@ ] }, "locked": { - "lastModified": 1732472774, - "narHash": "sha256-nfD12L8mm1Zcg0keslWrQgaqj+ZSjQnK6Hf6ryIZA0c=", + "lastModified": 1733389730, + "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", "owner": "nix-community", "repo": "home-manager", - "rev": "83002f18468c4471d5f8de8c542ed2422badbf8f", + "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", "type": "github" }, "original": { @@ -356,11 +356,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "type": "github" }, "original": { @@ -377,11 +377,11 @@ "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { - "lastModified": 1731769069, - "narHash": "sha256-c1I6gTF8hahY1/y2DdtL7zqoGMGQcs7Qya0N+weeCZI=", + "lastModified": 1733172252, + "narHash": "sha256-J0nvKqLuVIQ/U1MkP8yl+Eacf9j/waWmlRpWuxqyndE=", "owner": "fort-nix", "repo": "nix-bitcoin", - "rev": "c0994bfc7bc866a8c67b6433a33a49a53b2fc546", + "rev": "ff847d527cc95efc8449946ce01a4dd6cea00489", "type": "github" }, "original": { @@ -401,11 +401,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1732412226, - "narHash": "sha256-Eb7LqtaCVgZy5Kp3pMrRTAmcnFO7HGj6lpAM2TrQzTA=", + "lastModified": 1733339972, + "narHash": "sha256-6Ocb/x/7Y8mEjZU/xuxDZNX7EIQ5O0hKpzcYvH7+XdM=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "44c9057ebbf4eb41cff08b8fc9c952b3f977656a", + "rev": "368e94ef348c45ec800f5f4a6939a397c024f984", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -432,11 +432,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730137625, - "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", + "lastModified": 1732749044, + "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", + "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "type": "github" }, "original": { @@ -479,16 +479,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -511,11 +511,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730170245, - "narHash": "sha256-PRq4vJjDa+m1mNwkV9H7zVzMhuMqsHJrTGx0iJZ0e0w=", + "lastModified": 1732997066, + "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30c9efeef01e2ad4880bff6a01a61dd99536b3c9", + "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", "type": "github" }, "original": { @@ -527,11 +527,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -580,11 +580,11 @@ ] }, "locked": { - "lastModified": 1732465698, - "narHash": "sha256-xiue+Kj2Jm8PwyZQcHl4CaYmMIgo5oi37hVHqiw2Unk=", + "lastModified": 1733410572, + "narHash": "sha256-XkMZGeqg0GCRoSXvMcaHP7bdvWPRZxCK1sw1ASsc16E=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "16d65cd02b5de665d1bcfec1616c02c71a1014a6", + "rev": "92721d7402526599366d00e242813798e9914970", "type": "github" }, "original": { @@ -657,11 +657,11 @@ ] }, "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", + "lastModified": 1732933841, + "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", + "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", "type": "github" }, "original": { @@ -711,11 +711,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1732261424, - "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=", + "lastModified": 1733262405, + "narHash": "sha256-/AT315It87ll6mlZLYcmfoe6Uogx9MjPBCCZZZTq8xY=", "owner": "danth", "repo": "stylix", - "rev": "b667a340730dd3d0596083aa7c949eef01367c62", + "rev": "ffba1f1bab63ea49541f812c72a4fcf305461d67", "type": "github" }, "original": { @@ -791,11 +791,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 09cd556..ff219eb 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1140,22 +1140,10 @@ end source = ../.config/qutebrowser/config.py; }; - home.file.".config/qutebrowser/bookmarks" = { - source = ../.config/qutebrowser/bookmarks; - }; - home.file.".config/qutebrowser/css" = { source = ../.config/qutebrowser/css; }; - home.file.".config/qutebrowser/quickmarks" = { - source = ../.config/qutebrowser/quickmarks; - }; - - home.file.".config/qutebrowser/qsettings" = { - source = ../.config/qutebrowser/qsettings; - }; - home.file.".config/imv" = { source = ../.config/imv; recursive = true; diff --git a/modules/desktop.nix b/modules/desktop.nix index 3c583b6..8fe22b8 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -45,7 +45,7 @@ ''; fonts.packages = with pkgs; [ - nerdfonts + nerd-fonts.victor-mono noto-fonts noto-fonts-cjk-sans noto-fonts-emoji diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 6828ed4..a3e787c 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -18,6 +18,7 @@ ifuse dash dolphin + okular # guix # freecad # picard @@ -52,7 +53,7 @@ }) ani-cli # mov-cli - nerdfonts + nerd-fonts.victor-mono plasma-browser-integration alacritty libnotify @@ -88,7 +89,7 @@ virt-viewer # kdialog inkscape - # libreoffice-fresh + libreoffice-fresh vlc haskellPackages.greenclip pulsemixer