diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | awesome/.config/awesome/rc.lua | 2 | ||||
-rw-r--r-- | awesome/.config/awesome/themes/srcery/theme.lua | 2 | ||||
-rw-r--r-- | newsboat/.config/newsboat/urls | 6 | ||||
-rw-r--r-- | nix/awesome.nix (renamed from nix/etc/nixos/awesome.nix) | 17 | ||||
-rw-r--r-- | nix/configuration.nix (renamed from nix/etc/nixos/configuration.nix) | 16 | ||||
-rw-r--r-- | nix/devel.nix (renamed from nix/etc/nixos/devel.nix) | 8 | ||||
-rw-r--r-- | nix/games.nix (renamed from nix/etc/nixos/games.nix) | 6 | ||||
-rw-r--r-- | nix/hardware-configuration.nix (renamed from nix/etc/nixos/hardware-configuration.nix) | 0 | ||||
-rw-r--r-- | nixos/.Xdefaults | 5 | ||||
-rw-r--r-- | ranger/.config/ranger/rc.conf | 2 |
11 files changed, 42 insertions, 23 deletions
diff --git a/.gitignore b/.gitignore index 424f9c7..fd12051 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ .uuid __pycache__ audio/.config/pulse/cookie -nix/etc/nixos/redshift.nix vim/.cache/vim vim/.vim/.netrwhist vim/.vim/plugged diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua index a204762..0beffe7 100644 --- a/awesome/.config/awesome/rc.lua +++ b/awesome/.config/awesome/rc.lua @@ -791,7 +791,7 @@ client.connect_signal( awful.titlebar.widget.stickybutton(c), awful.titlebar.widget.maximizedbutton(c), awful.titlebar.widget.floatingbutton(c), - layout = wibox.layout.fixed.horizontal + layout = wibox.layout.fixed.horizontal }, {-- Middle {-- Title diff --git a/awesome/.config/awesome/themes/srcery/theme.lua b/awesome/.config/awesome/themes/srcery/theme.lua index baaac50..2161fb4 100644 --- a/awesome/.config/awesome/themes/srcery/theme.lua +++ b/awesome/.config/awesome/themes/srcery/theme.lua @@ -21,7 +21,7 @@ local theme = {} local wd = '~/.config/awesome/themes/srcery/' local function abspath(relative) return wd .. relative end -theme.font = 'Latin Modern Mono Caps 15' +theme.font = 'Latin Modern Mono 15' theme.hotkeys_font = 'Latin Modern Mono Bold 15' theme.hotkeys_description_font = theme.font diff --git a/newsboat/.config/newsboat/urls b/newsboat/.config/newsboat/urls index 7b6e7fc..8137c84 100644 --- a/newsboat/.config/newsboat/urls +++ b/newsboat/.config/newsboat/urls @@ -6,15 +6,17 @@ https://www.fsf.org/static/fsforg/rss/jobs.xml https://ar.al/index.xml https://andrewkelley.me/rss.xml https://tyil.nl/atom.xml -https://andrewshitov.com/feed +https://secluded.site/posts/index.xml https://codesections.com/rss.xml +https://andrewshitov.com/feed https://pgjones.dev/blog/atom.xml https://blog.ganssle.io/feeds/all.atom.xml https://vorpus.org/blog/feeds/atom.xml +https://voussoir.net/writing/writing.atom https://danct12.github.io/feed.xml https://raphlinus.github.io/feed.xml https://www.chrisj.com.au/feeds/posts/default https://feeds.feedburner.com/WolfireGames https://cnx.srht.site/feed.xml -https://huyngo.srht.site/index.xml +https://huyngo.envs.net/index.xml https://node2.feed43.com/7524823728140683.xml diff --git a/nix/etc/nixos/awesome.nix b/nix/awesome.nix index dfd526d..15c7bd3 100644 --- a/nix/etc/nixos/awesome.nix +++ b/nix/awesome.nix @@ -1,14 +1,13 @@ { pkgs, ... }: { - imports = [ ./redshift.nix ]; - - fonts.fonts = with pkgs; [ lmodern ]; + fonts.fonts = with pkgs; [ julia-mono lmodern ]; services = { autorandr.enable = true; xserver = { enable = true; + desktopManager.xterm.enable = false; displayManager.startx.enable = true; windowManager.awesome.enable = true; @@ -27,14 +26,14 @@ }; environment.systemPackages = with pkgs; [ - gnome.adwaita-icon-theme qt5ct - gnome.networkmanagerapplet keynav mate.mate-power-manager - clipnotify playerctl pulsemixer xclip xdotool - rxvt_unicode-with-plugins urxvt_autocomplete_all_the_things urxvt_font_size - aerc amfora newsboat ranger ueberzug vim_configurable - arandr audacious firefox gimp nheko scrot xorg.xkill zathura + gnome.adwaita-icon-theme gnome.networkmanagerapplet qt5ct + clipbuzz playerctl pulsemixer xclip xdotool + aerc amfora ncdu newsboat ranger ueberzug rxvt-unicode vim_configurable + arandr audacious keynav scrot sigil xorg.xkill zathura + firefox libreoffice nheko transmission-gtk ]; programs.nm-applet.enable = true; programs.slock.enable = true; + programs.udevil.enable = true; } diff --git a/nix/etc/nixos/configuration.nix b/nix/configuration.nix index 2829879..83d28c9 100644 --- a/nix/etc/nixos/configuration.nix +++ b/nix/configuration.nix @@ -44,6 +44,11 @@ # firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # firewall.enable = false; + + # Overcoming my strange addiction + extraHosts = '' + 127.0.0.1 9gag.com + ''; }; # Set your time zone. @@ -60,9 +65,11 @@ extraGroups = [ "networkmanager" "wheel" ]; }; + nix.autoOptimiseStore = true; environment.systemPackages = with pkgs; [ - htop isync killall oathToolkit rsync stow w3m wget - ffmpeg mpv pavucontrol vimiv-qt youtube-dl + htop isync killall oathToolkit rsync stow unzip w3m wget + mpv pavucontrol sent vimiv-qt yacreader youtube-dl + ffmpeg gifski gimp imagemagick inkscape simplescreenrecorder ]; security.rtkit.enable = true; @@ -80,7 +87,10 @@ # media-session.enable = true; }; - printing.enable = true; + printing = { + enable = true; + drivers = with pkgs; [ hplipWithPlugin ]; + }; dictd = { enable = true; diff --git a/nix/etc/nixos/devel.nix b/nix/devel.nix index e554da9..113d966 100644 --- a/nix/etc/nixos/devel.nix +++ b/nix/devel.nix @@ -2,9 +2,10 @@ { environment.systemPackages = with pkgs; [ - exa fd git glow ripgrep rlwrap - clojure guile julia-stable leiningen lua python3 rakudo zig - texlive.combined.scheme-tetex + exa fd gitAndTools.gitFull glow jq manpages ripgrep rlwrap + clojure gcc guile julia-stable-bin lua python3 rakudo zig + bintools gdb gnumake leiningen pkg-config python38Packages.pip + groff plantuml texlive.combined.scheme-full ]; programs.mtr.enable = true; @@ -26,6 +27,7 @@ authentication = pkgs.lib.mkOverride 10 '' local all all trust host all all ::1/128 trust + host all all 127.0.0.1/32 password ''; }; }; diff --git a/nix/etc/nixos/games.nix b/nix/games.nix index 3a48dc4..ec0e2d8 100644 --- a/nix/etc/nixos/games.nix +++ b/nix/games.nix @@ -8,12 +8,16 @@ astromenace chromium-bsu # scrolling azimuth cdogs-sdl taisei # shmup bastet moon-buggy n2048 # text - blackshades redeclipse warsow xonotic-glx # fps + # blackshades redeclipse warsow xonotic-glx # fps blobwars openclonk sienna superTux # platformer bonzomatic # edu extremetuxracer gl117 gltron superTuxKart # vehicle flare freedroidrpg hyperrogue # slash frozen-bubble gnujump gtetrinet pinball xbill # coffeebreak neverball orthorobot trackballs # puzzle + (steam.override { + nativeOnly = true; + extraPkgs = pkgs: [ SDL2_net ]; + }).run gnome.gtk # launcher ]; } diff --git a/nix/etc/nixos/hardware-configuration.nix b/nix/hardware-configuration.nix index 9ac7c6c..9ac7c6c 100644 --- a/nix/etc/nixos/hardware-configuration.nix +++ b/nix/hardware-configuration.nix diff --git a/nixos/.Xdefaults b/nixos/.Xdefaults index 1a3cfc1..b9581ea 100644 --- a/nixos/.Xdefaults +++ b/nixos/.Xdefaults @@ -28,5 +28,8 @@ URxvt.jumpScroll: true URxvt.font: xft:Latin Modern Mono:size=15:autohint=true URxvt.termName: rxvt-unicode-256color -URxvt.perl-ext-common: default,font-size +URxvt.perl-ext-common: default,font-size,autocomplete-ALL-the-things URxvt.font-size.step: 1 +URxvt.keysym.M-C-slash: perl:aAtt:word-complete +URxvt.keysym.M-question: perl:aAtt:fuzzy-complete +URxvt.keysym.M-quotedbl: perl:aAtt:undo diff --git a/ranger/.config/ranger/rc.conf b/ranger/.config/ranger/rc.conf index 79e8c14..7ce756e 100644 --- a/ranger/.config/ranger/rc.conf +++ b/ranger/.config/ranger/rc.conf @@ -57,7 +57,7 @@ set automatically_count_files true set open_all_images true # Be aware of version control systems and display information. -set vcs_aware true +set vcs_aware false # State of the four backends git, hg, bzr, svn. The possible states are # disabled, local (only show local info), enabled (show local and remote |